individually release/label each staging commit

Author: laverya

.github/workflows/build-package-staging.yaml

@@ -24,7 +24,7 @@ jobs:
           PKG: ${{ github.event.client_payload.package || github.event.inputs.package }}
         run: |
           git fetch --tags -f
-          export VERSION_TAG=$(git tag | grep '^v20' | grep -v 'v2022\.09\.04' | sort | tail -1)-dirty
+          export VERSION_TAG=$(git tag | grep '^v20' | sort | tail -1)-$(git rev-parse --short HEAD)
           export KURL_UTIL_IMAGE=replicated/kurl-util:${VERSION_TAG}
 
           make dist/$PKG
@@ -44,7 +44,7 @@ jobs:
           CF_KURL_ZONE: ${{ secrets.CF_KURL_ZONE }}
         run: |
           git fetch --tags -f
-          export VERSION_TAG=$(git tag | grep '^v20' | grep -v 'v2022\.09\.04' | sort | tail -1)-dirty
+          export VERSION_TAG=$(git tag | grep '^v20' | sort | tail -1)-$(git rev-parse --short HEAD)
           
           echo "purging s3-staging.kurl.sh/staging/${VERSION_TAG}/$PKG and s3-staging.kurl.sh/staging/$PKG"
           curl -X POST "https://api.cloudflare.com/client/v4/zones/$CF_KURL_ZONE/purge_cache" \

.github/workflows/cron-rebuild-packages-staging.yaml

@@ -14,7 +14,7 @@ jobs:
         name: Build image matrix
         run: |
           git fetch --tags -f
-          export VERSION_TAG=$(git tag | grep '^v20' | grep -v 'v2022\.09\.04' | sort | tail -1)-dirty
+          export VERSION_TAG=$(git tag | grep '^v20' | sort | tail -1)-$(git rev-parse --short HEAD)
           export KURL_UTIL_IMAGE=replicated/kurl-util:${VERSION_TAG}
           export KURL_BIN_UTILS_FILE=kurl-bin-utils-${VERSION_TAG}.tar.gz
           export KURL_BIN_UTILS_FILE_LATEST=kurl-bin-utils-latest.tar.gz
@@ -44,7 +44,7 @@ jobs:
           BATCH: ${{ matrix.batch }}
         run: |
           git fetch --tags -f
-          export VERSION_TAG=$(git tag | grep '^v20' | grep -v 'v2022\.09\.04' | sort | tail -1)-dirty
+          export VERSION_TAG=$(git tag | grep '^v20' | sort | tail -1)-$(git rev-parse --short HEAD)
           export KURL_UTIL_IMAGE=replicated/kurl-util:${VERSION_TAG}
 
           failed_pkgs=

.github/workflows/deploy-staging.yaml

@@ -21,7 +21,7 @@ jobs:
     - id: set-tag
       run: |
         git fetch --tags -f
-        export VERSION_TAG=$(git tag | grep '^v20' | grep -v 'v2022\.09\.04' | sort | tail -1)-dirty
+        export VERSION_TAG=$(git tag | grep '^v20' | sort | tail -1)-$(git rev-parse --short HEAD)
         echo "::set-output name=version_tag::${VERSION_TAG}"
 
   kurl-util-image:

ARCHITECTURE.md

@@ -193,10 +193,10 @@ Historical production releases are never removed from the object storage bucket.
 ### Staging Workflow
 
 Staging releases are triggered on merge to main.
-Staging release versions use the most current release version tag and append prerelease `-dirty`, for example v2022.04.19-0-dirty.
+Staging release versions use the most current release version tag and append the short commit sha `-abcdef0`, for example v2022.04.19-0-5af497c.
 Due to this versioning scheme, staging releases will overwrite the previous staging release if no production release occurred prior.
 This is intentional to optimize for storage costs.
-Staging releases are uploaded to the object storage bucket at prefix `staging`, for example https://kurl-sh.s3.amazonaws.com/staging/v2022.04.19-0-dirty/.
+Staging releases are uploaded to the object storage bucket at prefix `staging`, for example https://kurl-sh.s3.amazonaws.com/staging/v2022.04.19-0-5af497c/.
 Before building add-on packages, the workflow will first check if there were any changes made to the add-on since the previous staging release based on metadata included with the add-on package.
 If no changes were made, the package will be copied from the previous staging release to optimize for build times.
 If changes were made, the package will be built from source and uploaded.