Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
ci/cd: fix next release logic
Kyle Mendelld14a051be090
diff --git a/.github/workflows/build-next-images.yml b/.github/workflows/build-next-images.ymlindex c44240174..bb3307298 100644--- a/.github/workflows/build-next-images.yml+++ b/.github/workflows/build-next-images.yml@@ -17,26 +17,10 @@ permissions:id-token: writejobs:- build-images:- name: Build Next Image (${{ matrix.display }})+ binaries:+ name: Build Binariesruns-on: depot-ubuntu-24.04-16- timeout-minutes: 45- strategy:- fail-fast: false- matrix:- include:- - target: manager- display: Arcane- needs-frontend: true- build-flags: "--docker"- dockerfile: docker/Dockerfile-static- image-suffix: arcane- - target: agent- display: Arcane Headless- needs-frontend: false- build-flags: "--docker --agent"- dockerfile: docker/Dockerfile-agent-static- image-suffix: arcane-headless+ timeout-minutes: 30steps:- name: Checkout codeuses: actions/checkout@v6@@ -46,13 +30,11 @@ jobs:run: echo "value=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT- name: Setup pnpm- if: matrix.needs-frontenduses: pnpm/action-setup@v4with:run_install: false- name: Setup Node.js- if: matrix.needs-frontenduses: actions/setup-node@v6with:node-version: 25@@ -65,6 +47,55 @@ jobs:cache: truecache-dependency-path: backend/go.sum+ - name: Install frontend dependencies+ run: pnpm -C frontend install --frozen-lockfile++ - name: Build frontend+ run: pnpm -C frontend build++ - name: Build manager binaries+ run: bash scripts/github/build-binaries.sh+ env:+ VERSION: next+ REVISION: ${{ steps.short-sha.outputs.value }}++ - name: Build agent binaries+ run: bash scripts/github/build-binaries.sh --agent+ env:+ VERSION: next+ REVISION: ${{ steps.short-sha.outputs.value }}++ - name: Binary attestation+ uses: actions/attest-build-provenance@v3+ with:+ subject-path: "backend/.bin/*"++ - name: Upload binaries artifact+ uses: actions/upload-artifact@v5+ with:+ path: backend/.bin/*+ name: binaries++ images:+ name: Build Next Image (${{ matrix.display }})+ runs-on: depot-ubuntu-24.04-16+ timeout-minutes: 45+ strategy:+ fail-fast: false+ matrix:+ include:+ - target: manager+ display: Arcane+ dockerfile: docker/Dockerfile+ image-suffix: arcane+ - target: agent+ display: Arcane Headless+ dockerfile: docker/Dockerfile-agent+ image-suffix: arcane-headless+ steps:+ - name: Checkout code+ uses: actions/checkout@v6+- name: Set up Depot CLIuses: depot/setup-action@v1@@ -81,20 +112,6 @@ jobs:username: ${{ github.repository_owner }}password: ${{ secrets.GITHUB_TOKEN }}- - name: Install frontend dependencies- if: matrix.needs-frontend- run: pnpm --filter arcane-frontend install --frozen-lockfile-- - name: Build frontend- if: matrix.needs-frontend- run: pnpm --filter arcane-frontend build-- - name: Build binaries- run: bash scripts/github/build-binaries.sh ${{ matrix.build-flags }}- env:- VERSION: next- REVISION: ${{ steps.short-sha.outputs.value }}-- name: Build and push container imageid: build-push-imageuses: depot/build-push-action@v1@@ -104,6 +121,9 @@ jobs:push: truetags: ${{ steps.image-name.outputs.value }}:nextfile: ${{ matrix.dockerfile }}+ build-args: |+ VERSION=next+ REVISION=${{ github.sha }}sbom: truesbom-dir: sbom-output/${{ matrix.target }}provenance: true@@ -114,20 +134,6 @@ jobs:path: sbom-output/${{ matrix.target }}name: SBOM-${{ matrix.target }}- - name: Upload binaries artifact- if: matrix.target == 'manager'- uses: actions/upload-artifact@v5- with:- path: backend/.bin/*- name: binaries-${{ matrix.target }}-- - name: Upload binaries artifact- if: matrix.target == 'agent'- uses: actions/upload-artifact@v5- with:- path: backend/.bin/*- name: binaries-${{ matrix.target }}-- name: Attest build provenanceuses: actions/attest-build-provenance@v3with:@@ -136,9 +142,9 @@ jobs:push-to-registry: truerelease-next:- name: Release Next (Pre-release)+ name: Create Pre-releaseruns-on: depot-ubuntu-24.04-16- needs: build-images+ needs: [binaries, images]timeout-minutes: 15steps:- name: Checkout code@@ -150,17 +156,11 @@ jobs:id: short-sharun: echo "value=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT- - name: Download manager binaries- uses: actions/download-artifact@v6- with:- name: binaries-manager- path: binaries/manager-- - name: Download agent binaries+ - name: Download binariesuses: actions/download-artifact@v6with:- name: binaries-agent- path: binaries/agent+ name: binaries+ path: binaries- name: Download manager SBOMuses: actions/download-artifact@v6@@ -174,26 +174,13 @@ jobs:name: SBOM-agentpath: sbom/agent- - name: Prepare release binaries- run: |- mkdir -p release-binaries- cp binaries/manager/* release-binaries/ 2>/dev/null || true- cp binaries/agent/* release-binaries/ 2>/dev/null || true- ls -la release-binaries/-- name: Prepare SBOM artifactsrun: |mkdir -p release-sbom- # Package SBOMs as zip files for cleaner release assetscd sbom/manager && zip -r ../../release-sbom/sbom-arcane.zip . && cd ../..cd sbom/agent && zip -r ../../release-sbom/sbom-arcane-headless.zip . && cd ../..ls -la release-sbom/- - name: Binary attestation- uses: actions/attest-build-provenance@v3- with:- subject-path: "release-binaries/*"-- name: Generate release notesrun: |COMMIT_SHA="${{ github.sha }}"@@ -202,13 +189,14 @@ jobs:COMMIT_AUTHOR=$(git log -1 --pretty=%an)COMMIT_DATE=$(git log -1 --pretty=%ci)REPO_OWNER=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')+ REPO="${{ github.repository }}"cat << EOF > release-notes.mdThis pre-release is automatically built and generated on every commit to main.> [!WARNING]> This is a nightly build, not a tagged release. We recommend using tagged releases.- > You can find tagged releases on the [releases page](https://github.com/${{ github.repository }}/releases/latest).+ > You can find tagged releases on the [releases page](https://github.com/${REPO}/releases/latest).---@@ -216,7 +204,7 @@ jobs:| Property | Value ||----------|-------|- | **Commit** | [\`${SHORT_SHA}\`](https://github.com/${{ github.repository }}/commit/${COMMIT_SHA}) |+ | **Commit** | [\`${SHORT_SHA}\`](https://github.com/${REPO}/commit/${COMMIT_SHA}) || **Author** | ${COMMIT_AUTHOR} || **Date** | ${COMMIT_DATE} || **Branch** | \`main\` |@@ -238,16 +226,33 @@ jobs:\`\`\`EOF- - name: Create pre-release- uses: softprops/action-gh-release@v2- with:- tag_name: next- name: Next (Pre-release)- body_path: release-notes.md- prerelease: true- make_latest: false- target_commitish: main- overwrite_files: true- files: |- release-binaries/*- release-sbom/*+ - name: Delete existing next release+ env:+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}+ run: gh release delete next --yes --cleanup-tag 2>/dev/null || true++ - name: Create draft release+ env:+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}+ run: |+ gh release create next \+ --title "Next (Pre-release)" \+ --notes-file release-notes.md \+ --prerelease \+ --draft \+ --target main++ - name: Upload binaries to release+ env:+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}+ run: gh release upload next binaries/*++ - name: Upload SBOMs to release+ env:+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}+ run: gh release upload next release-sbom/*++ - name: Publish release+ env:+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}+ run: gh release edit next --draft=false