Skip to content

Commit 6707d8e

Browse files
Merge remote-tracking branch 'upstream/main' into apachegh-42222-copy-to
2 parents 50f3030 + 3420c0d commit 6707d8e

109 files changed

Lines changed: 5022 additions & 1104 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/archery.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ on:
3434
env:
3535
ARCHERY_DEBUG: 1
3636
ARCHERY_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
37-
ARCHERY_USE_DOCKER_CLI: 1
3837

3938
concurrency:
4039
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}

‎.github/workflows/cpp.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
cat <<JSON >> "$GITHUB_OUTPUT"
100100
{
101101
"arch": "arm64v8",
102-
"archery-use-docker-cli": "0",
102+
"archery-use-legacy-docker-compose": "1",
103103
"clang-tools": "10",
104104
"image": "ubuntu-cpp",
105105
"llvm": "10",
@@ -124,9 +124,9 @@ jobs:
124124
include: ${{ fromJson(needs.docker-targets.outputs.targets) }}
125125
env:
126126
ARCH: ${{ matrix.arch }}
127-
# By default, use Docker CLI because docker-compose v1 is obsolete,
127+
# By default, use `docker compose` because docker-compose v1 is obsolete,
128128
# except where the Docker client version is too old.
129-
ARCHERY_USE_DOCKER_CLI: ${{ matrix.archery-use-docker-cli || '1' }}
129+
ARCHERY_USE_LEGACY_DOCKER_COMPOSE: ${{ matrix.archery-use-legacy-docker-compose || '0' }}
130130
ARROW_SIMD_LEVEL: ${{ matrix.simd-level }}
131131
CLANG_TOOLS: ${{ matrix.clang-tools }}
132132
LLVM: ${{ matrix.llvm }}
@@ -189,7 +189,7 @@ jobs:
189189
- name: Run minimal example
190190
run: |
191191
cd cpp/examples/minimal_build
192-
docker-compose run --rm minimal
192+
docker compose run --rm minimal
193193
194194
macos:
195195
name: ${{ matrix.architecture }} macOS ${{ matrix.macos-version }} C++

‎.github/workflows/dev.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ permissions:
3131

3232
env:
3333
ARCHERY_DEBUG: 1
34-
ARCHERY_USE_DOCKER_CLI: 1
3534

3635
jobs:
3736

‎.github/workflows/docs.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ permissions:
2525

2626
env:
2727
ARCHERY_DEBUG: 1
28-
ARCHERY_USE_DOCKER_CLI: 1
2928
ARROW_ENABLE_TIMING_TESTS: OFF
3029
DOCKER_VOLUME_PREFIX: ".docker/"
3130

‎.github/workflows/docs_light.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ permissions:
3434

3535
env:
3636
ARCHERY_DEBUG: 1
37-
ARCHERY_USE_DOCKER_CLI: 1
3837
ARROW_ENABLE_TIMING_TESTS: OFF
3938
DOCKER_VOLUME_PREFIX: ".docker/"
4039

‎.github/workflows/go.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ permissions:
4343

4444
env:
4545
ARCHERY_DEBUG: 1
46-
ARCHERY_USE_DOCKER_CLI: 1
4746

4847
jobs:
4948

@@ -79,14 +78,14 @@ jobs:
7978
{
8079
"arch-label": "ARM64",
8180
"arch": "arm64v8",
82-
"archery-use-docker-cli": "0",
81+
"archery-use-legacy-docker-compose": "1",
8382
"go": "1.21",
8483
"runs-on": ["self-hosted", "arm", "linux"]
8584
},
8685
{
8786
"arch-label": "ARM64",
8887
"arch": "arm64v8",
89-
"archery-use-docker-cli": "0",
88+
"archery-use-legacy-docker-compose": "1",
9089
"go": "1.22",
9190
"runs-on": ["self-hosted", "arm", "linux"]
9291
}
@@ -109,7 +108,7 @@ jobs:
109108
ARCH: ${{ matrix.arch }}
110109
# By default, use Docker CLI because docker-compose v1 is obsolete,
111110
# except where the Docker client version is too old.
112-
ARCHERY_USE_DOCKER_CLI: ${{ matrix.archery-use-docker-cli || '1' }}
111+
ARCHERY_USE_LEGACY_DOCKER_COMPOSE: ${{ matrix.archery-use-legacy-docker-compose || '0' }}
113112
GO: ${{ matrix.go }}
114113
steps:
115114
- name: Checkout Arrow

‎.github/workflows/integration.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ permissions:
5454

5555
env:
5656
ARCHERY_DEBUG: 1
57-
ARCHERY_USE_DOCKER_CLI: 1
5857
DOCKER_VOLUME_PREFIX: ".docker/"
5958

6059
jobs:

‎.github/workflows/java.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ permissions:
4646

4747
env:
4848
ARCHERY_DEBUG: 1
49-
ARCHERY_USE_DOCKER_CLI: 1
5049
DOCKER_VOLUME_PREFIX: ".docker/"
5150

5251
jobs:

‎.github/workflows/java_jni.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ permissions:
4646

4747
env:
4848
ARCHERY_DEBUG: 1
49-
ARCHERY_USE_DOCKER_CLI: 1
5049
DOCKER_VOLUME_PREFIX: ".docker/"
5150

5251
jobs:

‎.github/workflows/js.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ permissions:
4040

4141
env:
4242
ARCHERY_DEBUG: 1
43-
ARCHERY_USE_DOCKER_CLI: 1
4443

4544
jobs:
4645

0 commit comments

Comments
 (0)