add fix for nightly workflow

Signed-off-by: Soule BA <bah.soule@gmail.com>
weaveworks · Oct 19, 2023 · 2fa8fb9 · 2fa8fb9
1 parent 18d85fe
commit 2fa8fb9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/nightly_v21.yaml b/.github/workflows/nightly_v21.yaml
@@ -11,20 +11,22 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ssh-key: "${{ secrets.NIGHTLY_BUILD_KEY }}"
+          fetch-depth: 0
       - name: Push nightly tag
         shell: bash
         run: |
           git config --global user.name "Soule BA"
           git config --global user.email "soule@weave.works"
 
           # Get the latest release tag
-          git fetch 'refs/tags/*:refs/tags/*'
           DESCRIBE=$(git tag -l --sort=-v:refname | grep -v nightly | head -n 1)
           MAJOR_VERSION=$(echo $DESCRIBE | awk '{split($0,a,"."); print a[1]}')
           MINOR_VERSION=$(echo $DESCRIBE | awk '{split($0,a,"."); print a[2]}')
           PATCH_VERSION=$(echo $DESCRIBE | awk '{split($0,a,"."); print a[3]}')
           PATCH_NUMBER=$(echo $DESCRIBE | awk '{split($0,a,"."); print a[4]}')
-          TAG="${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}
+          TAG="${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}"
           if [[ "$PATCH_NUMBER" =~ ^[0-9]+$ ]]; then
             TAG="${TAG}.${PATCH_NUMBER}"
           fi

diff --git a/.github/workflows/release_v21.yaml b/.github/workflows/release_v21.yaml
@@ -15,7 +15,7 @@ jobs:
         id: version
         shell: bash
         run: |
-          if [[ "{{  github.ref_name }}" == "*.nightly*" ]]; then
+          if [[ "${{  github.ref }}" == refs/tags/v*.nightly* ]]; then
             echo "nightly=true" >> $GITHUB_OUTPUT
           else
             echo "nightly=false" >> $GITHUB_OUTPUT
@@ -212,7 +212,7 @@ jobs:
       contents: write # needed to write releases
       id-token: write # needed for keyless signing
       packages: write # needed for ghcr access
-    needs: [sc-ghcr-provenance, kc-ghcr-provenance, hc-ghcr-provenance, irc-ghcr-provenance, iac-ghcr-provenance, nc-ghcr-provenance]
+    needs: [nightly-tag,sc-ghcr-provenance, kc-ghcr-provenance, hc-ghcr-provenance, irc-ghcr-provenance, iac-ghcr-provenance, nc-ghcr-provenance]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -250,13 +250,17 @@ jobs:
           ln -s patches-flux-v21 patches-flux
           rm -rf flux2 || true
           source ./patches-flux/VERSION
+          # set LATEST_RELEASE to true by default
+          # it will be set to false if the release is a nightly build
+          LATEST_RELEASE=true
           if [[ "$FLUX2_SUFFIX_VERSION" =~ ^wa[.][0-9]+$ ]]; then
             VERSION=${FLUX2_BASE_VERSION}-${FLUX2_SUFFIX_VERSION}
           else
             VERSION=${FLUX2_BASE_VERSION}-wa
           fi
           if [[ "${{ needs.nightly-tag.outputs.nightly }}" == "true" ]]; then
             VERSION=${VERSION}-nightly.$(date +%y%m%d%H%M%S)
+            LATEST_RELEASE=false
           else
             VERSION=${VERSION}.$(date +%y%m%d%H%M%S)
           fi
@@ -265,6 +269,7 @@ jobs:
           RAW_VERSION=$(echo $VERSION | cut -c2-)
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
           echo "raw_version=${RAW_VERSION}" >> $GITHUB_OUTPUT
+          echo "latest_release=${LATEST_RELEASE}" >> $GITHUB_OUTPUT
       - name: Download all controllers release artifacts
         uses: actions/download-artifact@v3
         with:
@@ -324,6 +329,7 @@ jobs:
           HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
           BUILD_VERSION: ${{ steps.patch.outputs.version }}
           BUILD_VERSION_RAW: ${{ steps.patch.outputs.raw_version }}
+          LATEST_RELEASE: ${{ steps.patch.outputs.latest_release }}
       - name: Generate SLSA metadata
         id: slsa
         env:
@@ -342,7 +348,7 @@ jobs:
 
   release-flux-manifests:
     runs-on: ubuntu-latest
-    needs: release-flux-cli
+    needs: [nightly-tag, release-flux-cli]
     permissions:
       id-token: write
       packages: write

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -50,6 +50,7 @@ sboms:
     documents:
       - "{{ .ProjectName }}_{{ .Version }}_sbom.spdx.json"
 release:
+  make_latest: "{{ .Env.LATEST_RELEASE }}"
   extra_files:
     - glob: output/crd-schemas.tar.gz
     - glob: output/manifests.tar.gz