diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml index 23c3137..690a15d 100644 --- a/.github/workflows/gh-ci.yaml +++ b/.github/workflows/gh-ci.yaml @@ -49,12 +49,18 @@ jobs: uses: actions/checkout@v3 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + - name: Set up Docker + uses: docker/setup-docker-action@v4 with: - driver: docker + daemon-config: | + { + "debug": true, + "features": { + "containerd-snapshotter": true + } + } - name: Login to DockerHub uses: docker/login-action@v1 @@ -118,7 +124,7 @@ jobs: - name: Build base v0 if: ${{ matrix.image_dir == 'coffea-base' }} - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: load: true tags: ${{ steps.tags.outputs.tags }} @@ -130,7 +136,7 @@ jobs: - name: Build base v1 if: ${{ matrix.image_dir != 'coffea-base' }} - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: load: true tags: ${{ steps.tags.outputs.tags }} @@ -178,9 +184,9 @@ jobs: - name: Build and push v0 if: ${{ matrix.image_dir != 'coffea-base' }} - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64/v8 push: ${{ github.event_name == 'push' }} tags: ${{ steps.tags.outputs.tags }} context: ${{ matrix.image_dir }} @@ -191,9 +197,9 @@ jobs: - name: Build and push v1 if: ${{ matrix.image_dir == 'coffea-base' }} - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64/v8 push: ${{ github.event_name == 'push' }} tags: ${{ steps.tags.outputs.tags }} context: ${{ matrix.image_dir }} @@ -202,3 +208,4 @@ jobs: python=${{ matrix.python }} releasev0=${{ env.releasev0 }} + diff --git a/coffea-dask/environment.yaml b/coffea-dask/environment.yaml index dd9dece..443554f 100644 --- a/coffea-dask/environment.yaml +++ b/coffea-dask/environment.yaml @@ -11,7 +11,7 @@ dependencies: - xrootd # we have issues with conflicting openssl version and htcondor 10.8.0 version is last one # which we able to resolve in this environment.yaml - - htcondor + - htcondor=10.9.0 # pin HTCondor for LPC - curl # jupyter-related - jupyterlab