From 0b06735701f3fb4b2b7e6dce7ef05e7709486c43 Mon Sep 17 00:00:00 2001 From: Soule BA Date: Sun, 15 Oct 2023 00:37:10 +0200 Subject: [PATCH] add fix for nightly workflow Signed-off-by: Soule BA --- .github/workflows/nightly_v21.yaml | 6 ++++-- .github/workflows/release_v21.yaml | 8 +++++++- .goreleaser.yml | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly_v21.yaml b/.github/workflows/nightly_v21.yaml index f9ac704..90c4482 100644 --- a/.github/workflows/nightly_v21.yaml +++ b/.github/workflows/nightly_v21.yaml @@ -11,6 +11,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + sh-key: "${{ secrets.NIGHTLY_BUILD_KEY }}" + fetch-depth: 0 - name: Push nightly tag shell: bash run: | @@ -18,13 +21,12 @@ jobs: 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 index 6961398..e611fee 100644 --- 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_name }}" == *.nightly* ]]; then echo "nightly=true" >> $GITHUB_OUTPUT else echo "nightly=false" >> $GITHUB_OUTPUT @@ -250,6 +250,9 @@ 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 @@ -257,6 +260,7 @@ jobs: 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: diff --git a/.goreleaser.yml b/.goreleaser.yml index c132749..ae7edae 100644 --- 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