From 68310b7fc7d79050017d830cc7c3bfb5bd7e1535 Mon Sep 17 00:00:00 2001 From: Jusong Yu Date: Fri, 23 Feb 2024 18:12:34 +0100 Subject: [PATCH] Try: move to macos-14 in GHA --- .github/actions/create-dev-env/action.yml | 1 + .github/workflows/docker-build-test-upload.yml | 17 +++-------------- .github/workflows/docker.yml | 8 ++++---- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/.github/actions/create-dev-env/action.yml b/.github/actions/create-dev-env/action.yml index 85c46980..96600e53 100644 --- a/.github/actions/create-dev-env/action.yml +++ b/.github/actions/create-dev-env/action.yml @@ -1,4 +1,5 @@ --- +# TODO: delete ME name: Build environment description: Create build environment diff --git a/.github/workflows/docker-build-test-upload.yml b/.github/workflows/docker-build-test-upload.yml index bfa6ac78..c693461c 100644 --- a/.github/workflows/docker-build-test-upload.yml +++ b/.github/workflows/docker-build-test-upload.yml @@ -28,21 +28,10 @@ jobs: steps: - name: Checkout Repo ⚡️ uses: actions/checkout@v4 - - name: Create dev environment 📦 - uses: ./.github/actions/create-dev-env - with: - architecture: ${{ inputs.architecture }} - - # Self-hosted runners share a state (whole VM) between runs - # Also, they might have running or stopped containers, - # which are not cleaned up by `docker system prun` - - name: Reset docker state and cleanup artifacts 🗑️ - if: ${{ inputs.platform != 'x86_64' }} + - name: Install Dev Dependencies 📦 run: | - docker kill $(docker ps --quiet) || true - docker rm $(docker ps --all --quiet) || true - docker system prune --all --force - rm -rf /tmp/aiidalab/ + pip install --upgrade pip + pip install --upgrade -r requirements-dev.txt shell: bash - name: Build image 🛠 diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d9d4480d..5bdd4bbb 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -53,14 +53,14 @@ jobs: with: image: base architecture: arm64 - runsOn: ARM64 + runsOn: macos-14 arm64-lab: uses: ./.github/workflows/docker-build-test-upload.yml with: image: lab architecture: arm64 - runsOn: ARM64 + runsOn: macos-14 needs: [arm64-base] arm64-base-with-services: @@ -68,7 +68,7 @@ jobs: with: image: base-with-services architecture: arm64 - runsOn: ARM64 + runsOn: macos-14 needs: [arm64-base] arm64-full-stack: @@ -76,7 +76,7 @@ jobs: with: image: full-stack architecture: arm64 - runsOn: ARM64 + runsOn: macos-14 needs: [arm64-base-with-services, arm64-lab] amd64-push-ghcr: