Skip to content

Commit

Permalink
fix: removed multiplatform build in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
eroan-marie committed Dec 4, 2024
1 parent d0c605b commit ad860e0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: ${{ env.IMAGE }}
platforms: linux/amd64,linux/arm64
platforms: linux/amd64
push: true
tags: |
${{env.DOCKER_ORG}}/${{ env.IMAGE }}:master
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
with:
context: ${{ matrix.IMAGE }}
push: true
platforms: linux/amd64,linux/arm64
platforms: linux/amd64
tags: |
${{env.DOCKER_ORG}}/${{ matrix.IMAGE }}:master
${{env.DOCKER_ORG}}/${{ matrix.IMAGE }}:${{env.DOCKER_TAG}}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/CondaLock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ jobs:
run: |
cd ${{ matrix.IMAGE }}
if [ ${{ matrix.IMAGE }} = "base-notebook" ]; then
conda-lock lock -p linux-64 -p linux-aarch64 -p osx-64 -p osx-arm64
conda-lock lock -p linux-64
elif [ ${{ matrix.IMAGE }} = "pangeo-notebook" ]; then
conda-lock lock -f environment.yml -f ../base-notebook/environment.yml -p linux-64 -p linux-aarch64 -p osx-64 -p osx-arm64
conda-lock lock -f environment.yml -f ../base-notebook/environment.yml -p linux-64
else
# Linux-64 ONLY
conda-lock lock -f environment.yml -f ../pangeo-notebook/environment.yml -f ../base-notebook/environment.yml -p linux-64
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: base-image
platforms: linux/amd64,linux/arm64
platforms: linux/amd64
tags: localhost:5000/cnes/base-image:PR
push: true
cache-from: type=gha
Expand All @@ -64,7 +64,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: ${{ matrix.IMAGE }}
platforms: linux/amd64,linux/arm64
platforms: linux/amd64
push: true
tags: localhost:5000/${{env.DOCKER_ORG}}/${{ matrix.IMAGE }}:PR
build-args: PANGEO_BASE_IMAGE_TAG=PR
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Makefile for convenience, (doesn't look for command outputs)
.PHONY: all
all: base-image base-notebook pangeo-notebook ml-notebook pytorch-notebook
all: base-image base-notebook pangeo-notebook pytorch-notebook
TESTDIR=/srv/test

.PHONY: base-image
Expand Down

0 comments on commit ad860e0

Please sign in to comment.