Skip to content

Modern Docker Management, Designed for Everyone

ci/cd: fix next release logic

Kyle Mendellae40aec44cba
diff --git a/.github/workflows/build-next-images.yml b/.github/workflows/build-next-images.yml
index 5af396cc8..cf278528f 100644
--- a/.github/workflows/build-next-images.yml
+++ b/.github/workflows/build-next-images.yml
@@ -17,9 +17,84 @@ permissions:
id-token: write
jobs:
+ create-release:
+ name: Create Draft Release
+ runs-on: depot-ubuntu-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v6
+ with:
+ fetch-depth: 1
+
+ - name: Derive short SHA
+ id: short-sha
+ run: echo "value=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+ - name: Generate release notes
+ run: |
+ COMMIT_SHA="${{ github.sha }}"
+ SHORT_SHA="${{ steps.short-sha.outputs.value }}"
+ COMMIT_MSG=$(git log -1 --pretty=%B)
+ 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.md
+ This 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/${REPO}/releases/latest).
+
+ ---
+
+ ### Build Information
+
+ | Property | Value |
+ |----------|-------|
+ | **Commit** | [\`${SHORT_SHA}\`](https://github.com/${REPO}/commit/${COMMIT_SHA}) |
+ | **Author** | ${COMMIT_AUTHOR} |
+ | **Date** | ${COMMIT_DATE} |
+ | **Branch** | \`main\` |
+
+ ### Container Images
+
+ \`\`\`bash
+ # Manager
+ docker pull ghcr.io/${REPO_OWNER}/arcane:next
+
+ # Agent
+ docker pull ghcr.io/${REPO_OWNER}/arcane-headless:next
+ \`\`\`
+
+ ### Latest Commit
+
+ \`\`\`
+ ${COMMIT_MSG}
+ \`\`\`
+ EOF
+
+ - 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
+
binaries:
name: Build Binaries
runs-on: depot-ubuntu-24.04-16
+ needs: create-release
timeout-minutes: 30
steps:
- name: Checkout code
@@ -70,15 +145,15 @@ jobs:
with:
subject-path: "backend/.bin/*"
- - name: Upload binaries artifact
- uses: actions/upload-artifact@v4
- with:
- path: backend/.bin/*
- name: binaries
+ - name: Upload binaries to release
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: gh release upload next backend/.bin/*
images:
name: Build Next Image (${{ matrix.display }})
runs-on: depot-ubuntu-24.04-16
+ needs: create-release
timeout-minutes: 45
strategy:
fail-fast: false
@@ -128,130 +203,80 @@ jobs:
sbom-dir: sbom-output/${{ matrix.target }}
provenance: true
+ - name: Record digest
+ run: |
+ mkdir -p sbom-output/${{ matrix.target }}
+ echo "${{ steps.build-push-image.outputs.digest }}" > sbom-output/${{ matrix.target }}/digest.txt
+
- name: Upload SBOM artifact (${{ matrix.display }})
uses: actions/upload-artifact@v4
with:
path: sbom-output/${{ matrix.target }}
name: SBOM-${{ matrix.target }}
- - name: Attest build provenance
- uses: actions/attest-build-provenance@v3
- with:
- subject-name: "${{ steps.image-name.outputs.value }}"
- subject-digest: ${{ steps.build-push-image.outputs.digest }}
- push-to-registry: true
-
- release-next:
- name: Create Pre-release
- runs-on: depot-ubuntu-24.04-16
+ publish-release:
+ name: Publish Release
+ runs-on: depot-ubuntu-latest
needs: [binaries, images]
- timeout-minutes: 15
+ permissions:
+ contents: write
+ id-token: write
+ packages: write
+ attestations: write
steps:
- name: Checkout code
uses: actions/checkout@v6
- with:
- fetch-depth: 1
- - name: Derive short SHA
- id: short-sha
- run: echo "value=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
- - name: Download binaries
- uses: actions/download-artifact@v4
+ - name: Login to GHCR
+ uses: docker/login-action@v3
with:
- name: binaries
- path: binaries
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
- name: Download manager SBOM
uses: actions/download-artifact@v4
with:
name: SBOM-manager
- path: sbom/manager
+ path: sbom-artifacts/manager
- name: Download agent SBOM
uses: actions/download-artifact@v4
with:
name: SBOM-agent
- path: sbom/agent
+ path: sbom-artifacts/agent
- - name: Prepare SBOM artifacts
+ - name: Read digests
+ id: digests
run: |
- mkdir -p release-sbom
- cd 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: Generate release notes
- run: |
- COMMIT_SHA="${{ github.sha }}"
- SHORT_SHA="${{ steps.short-sha.outputs.value }}"
- COMMIT_MSG=$(git log -1 --pretty=%B)
- 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.md
- This 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/${REPO}/releases/latest).
-
- ---
-
- ### Build Information
-
- | Property | Value |
- |----------|-------|
- | **Commit** | [\`${SHORT_SHA}\`](https://github.com/${REPO}/commit/${COMMIT_SHA}) |
- | **Author** | ${COMMIT_AUTHOR} |
- | **Date** | ${COMMIT_DATE} |
- | **Branch** | \`main\` |
-
- ### Container Images
-
- \`\`\`bash
- # Manager
- docker pull ghcr.io/${REPO_OWNER}/arcane:next
+ echo "manager=$(cat sbom-artifacts/manager/digest.txt)" >> "$GITHUB_OUTPUT"
+ echo "agent=$(cat sbom-artifacts/agent/digest.txt)" >> "$GITHUB_OUTPUT"
- # Agent
- docker pull ghcr.io/${REPO_OWNER}/arcane-headless:next
- \`\`\`
-
- ### Latest Commit
-
- \`\`\`
- ${COMMIT_MSG}
- \`\`\`
- EOF
-
- - 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 }}
+ - name: Prepare SBOM artifacts
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/*
+ mkdir -p release-sbom
+ cd sbom-artifacts/manager && zip -r ../../release-sbom/sbom-arcane.zip . && cd ../..
+ cd sbom-artifacts/agent && zip -r ../../release-sbom/sbom-arcane-headless.zip . && cd ../..
- name: Upload SBOMs to release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh release upload next release-sbom/*
+ - name: Container image attestation (manager)
+ uses: actions/attest-build-provenance@v3
+ with:
+ subject-name: ghcr.io/${{ github.repository_owner }}/arcane
+ subject-digest: ${{ steps.digests.outputs.manager }}
+ push-to-registry: true
+
+ - name: Container image attestation (agent)
+ uses: actions/attest-build-provenance@v3
+ with:
+ subject-name: ghcr.io/${{ github.repository_owner }}/arcane-headless
+ subject-digest: ${{ steps.digests.outputs.agent }}
+ push-to-registry: true
+
- name: Publish release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}