try to fix integration

apache · Sep 5, 2024 · f86b2b6 · f86b2b6
1 parent f5aaa1e
commit f86b2b6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
@@ -46,7 +46,6 @@ jobs:
  - { runs_on: "ubuntu-latest", platform: "fedora", arch: "amd64", service: "verify" }
  - { runs_on: "ubuntu-latest", platform: "archlinux", arch: "amd64", service: "verify" }
  - { runs_on: "ubuntu-latest", platform: "alpine", arch: "amd64", service: "verify" }
- - { runs_on: "ubuntu-latest", arch: "amd64", platform: "integration", service: "integration" }
 
  - { runs_on: ["self-hosted", "arm"], platform: "ubuntu", arch: "arm64", service: "verify" }
  - { runs_on: ["self-hosted", "arm"], platform: "fedora", arch: "arm64", service: "verify" }

diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -37,5 +37,5 @@ jobs:
 
  - name: Run integration tests
  run: |
- echo "::group::Docker Pull"
+ echo "::group::Docker Build"
  docker compose run --rm -e GITHUB_ACTIONS integration
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -15,8 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-version: '3.5'
-
 services:
  verify:
  image: ${REPO}:${NANOARROW_PLATFORM}-${NANOARROW_ARCH}
@@ -48,12 +46,10 @@ services:
  command: "/bin/bash /build-docs.sh /nanoarrow"
 
  integration:
- # Based on an arrow-dev repo image that is amd64 only
- image: ${REPO}:integration-amd64
+ # Don't cache here (building the image takes about the same amount of time
+ # as downloading on CI)
  build:
  context: .
- cache_from:
- - ${REPO}:integration-amd64
  dockerfile: ci/docker/integration.dockerfile
  volumes:
  - ${NANOARROW_DOCKER_SOURCE_DIR}:/arrow-integration/nanoarrow