From 93ddaaa5e3659388676ac5261a7fe79ebc811e46 Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Mon, 1 Jul 2024 11:48:29 -0400 Subject: [PATCH] update various CI workflow action versions --- .cicd/platforms.json | 14 ---------- .github/workflows/build.yaml | 54 +++++++++--------------------------- 2 files changed, 13 insertions(+), 55 deletions(-) delete mode 100644 .cicd/platforms.json diff --git a/.cicd/platforms.json b/.cicd/platforms.json deleted file mode 100644 index a58fb761..00000000 --- a/.cicd/platforms.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ubuntu20": { - "dockerfile": ".cicd/platforms/ubuntu20.Dockerfile" - }, - "ubuntu22": { - "dockerfile": ".cicd/platforms/ubuntu22.Dockerfile" - }, - "ubuntu22-llvm": { - "dockerfile": ".cicd/platforms/ubuntu22-llvm.Dockerfile" - }, - "ubuntu24": { - "dockerfile": ".cicd/platforms/ubuntu24.Dockerfile" - } -} diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 40d96477..88068cea 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,42 +28,15 @@ defaults: shell: bash jobs: - d: - name: Discover Platforms - runs-on: ubuntu-latest - outputs: - missing-platforms: ${{steps.discover.outputs.missing-platforms}} - p: ${{steps.discover.outputs.platforms}} - steps: - - name: Discover Platforms - id: discover - uses: AntelopeIO/discover-platforms-action@v1 - with: - platform-file: .cicd/platforms.json - password: ${{secrets.GITHUB_TOKEN}} - package-name: builders - build-platforms: - name: Build Platforms - needs: d - if: needs.d.outputs.missing-platforms != '[]' - strategy: - fail-fast: false - matrix: - platform: ${{fromJSON(needs.d.outputs.missing-platforms)}} - runs-on: ["self-hosted", "enf-x86-beefy"] - steps: - - name: Login to Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{github.repository_owner}} - password: ${{secrets.GITHUB_TOKEN}} - - name: Build and push - uses: docker/build-push-action@v3 - with: - push: true - tags: ${{fromJSON(needs.d.outputs.p)[matrix.platform].image}} - file: ${{fromJSON(needs.d.outputs.p)[matrix.platform].dockerfile}} + platform-cache: + name: Platform Cache + uses: AntelopeIO/platform-cache-workflow/.github/workflows/platformcache.yaml@v1 + permissions: + packages: write + contents: read + with: + runs-on: '["self-hosted", "enf-x86-beefy"]' + platform-files: .cicd/platforms versions: name: Determine Versions @@ -90,16 +63,15 @@ jobs: Build: name: Build & Test - needs: [d, build-platforms, versions] - if: always() && needs.d.result == 'success' && (needs.build-platforms.result == 'success' || needs.build-platforms.result == 'skipped') + needs: [platform-cache, versions] strategy: fail-fast: false matrix: platform: [ubuntu20, ubuntu22, ubuntu22-llvm, ubuntu24] runs-on: ["self-hosted", "enf-x86-beefy"] - container: ${{fromJSON(needs.d.outputs.p)[matrix.platform].image}} + container: ${{fromJSON(needs.platform-cache.outputs.platforms)[matrix.platform].image}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - name: Download antelope-spring-dev.deb (Ubuntu 22 only) @@ -134,7 +106,7 @@ jobs: bash generate_package.sh deb ubuntu amd64 - name: Upload (Ubuntu 20 only) if: matrix.platform == 'ubuntu20' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: cdt_ubuntu_package_amd64 path: build/packages/cdt*amd64.deb