Improve artifact naming

Streamline this in CI config

Author: lrettig

.github/workflows/build_and_release.yml

@@ -3,17 +3,43 @@ name: Build and release artifacts
 on:
   workflow_dispatch:
   push:
-    branches:
-      #- main
-      - none
-    paths-ignore:
-      - README.md
+    tags:
+      - "*"
+    # branches:
+    #   - main
+    # paths-ignore:
+    #   - README.md
 
 permissions:
   contents: write
 
 jobs:
-  build:
+  prepare:
+    name: Prepare release
+    runs-on: ubuntu-latest
+    outputs:
+      tag_name: ${{ steps.release_info.outputs.tag_name }}
+      release_name: ${{ steps.release_info.outputs.release_name }}
+    steps:
+      # If it's a nightly release, tag with the release time. If the tag is `main`, we want to use
+      # `latest` as the tag name. Else, use the tag name as is.
+      - name: Compute release name and tag
+        id: release_info
+        run: |
+          # IS_NIGHTLY is currently unused
+          if [[ $IS_NIGHTLY ]]; then
+            echo "tag_name=nightly-${GITHUB_SHA}" >> $GITHUB_OUTPUT
+            echo "release_name=Nightly ($(date '+%Y-%m-%d'))" >> $GITHUB_OUTPUT
+          elif [[ "${GITHUB_REF_NAME}" == "main" ]]; then
+            echo "tag_name=latest" >> $GITHUB_OUTPUT
+            echo "release_name=Latest Release" >> $GITHUB_OUTPUT
+          else
+            echo "tag_name=${GITHUB_REF_NAME}" >> $GITHUB_OUTPUT
+            echo "release_name=${GITHUB_REF_NAME}" >> $GITHUB_OUTPUT
+          fi
+
+  build-and-release:
+    needs: prepare
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -37,15 +63,6 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - name: Set release version
-        id: version
-        run: echo "VERSION=$(cat version.txt)" >> "$GITHUB_OUTPUT"
-
-      - name: Print release version
-        env:
-          VERSION: ${{ steps.version.outputs.VERSION }}
-        run: echo "Current release is $VERSION"
-
       - name: Install ninja
         if: matrix.os == 'ubuntu-latest'
         run: |
@@ -72,12 +89,16 @@ jobs:
       - name: Package toolchain
         run: ./package.sh
 
+      - name: Rename artifact
+        run: mv ${{ env.ARTIFACT_NAME }}.tar.gz ${{ env.ARTIFACT_NAME }}-${{ needs.prepare.outputs.tag_name }}.tar.gz
+
       - name: Release
         uses: ncipollo/release-action@v1
         with:
           draft: true
-          tag: "v${{ steps.version.outputs.VERSION }}"
-          artifacts: "${{ env.ARTIFACT_NAME }}.tar.gz"
+          name: ${{ needs.prepare.outputs.release_name }}
+          tag: "${{ needs.prepare.outputs.tag_name }}"
+          artifacts: "${{ env.ARTIFACT_NAME }}-${{ needs.prepare.outputs.tag_name }}.tar.gz"
           allowUpdates: true
           omitBodyDuringUpdate: true
           omitDraftDuringUpdate: true

.github/workflows/ci.yml

@@ -56,6 +56,6 @@ jobs:
       - name: Archive build output
         uses: actions/upload-artifact@v3
         with:
-          name: rust-toolchain-${{ matrix.triple }}
+          name: athena-rust-toolchain-${{ matrix.triple }}
           path: |
-            athena/rust-toolchain-${{ matrix.triple }}.tar.gz
+            athena/athena-rust-toolchain-${{ matrix.triple }}.tar.gz

config.sh

@@ -11,30 +11,9 @@ fi
 
 export TOOLCHAIN_HOST_TRIPLET=$(rustc --version --verbose | grep 'host: ' | sed -r 's/host: (.*)/\1/')
 
-cd rust
-git show --no-patch --format=%ci $RUST_COMMIT > commit_show_output
-commit_show_output=$(cat commit_show_output)
-rm commit_show_output
-cd ../
-
-regex='([0-9]{4}-[0-9]{2}-[0-9]{2})'
-if [[ $commit_show_output =~ $regex ]]; then
-  rust_commit_date="${BASH_REMATCH[1]}"
-else
-  echo "Could not extract date from rustc commit"
-  exit 1
-fi
-
-# Toolchain itself does not need to be versioned by default. It makes referencing it from
-# various other projects harder while things are in development. Version can be queried by
-# calling `rustc --version` anyway. If someone needs to keep an older version they can
-# always rename the folder at install time.
-export TOOLCHAIN_NAME=rve-nightly
-
 # Artifact name should be versioned as it is only used at install time.
-export ARTIFACT_NAME=rust-rve-nightly-$rust_commit_date-$TOOLCHAIN_HOST_TRIPLET
+export ARTIFACT_NAME=athena-rust-toolchain-$TOOLCHAIN_HOST_TRIPLET
 
 if [ "$param1" == "-artifact_name" ]; then
     echo "ARTIFACT_NAME=$ARTIFACT_NAME" >> $GITHUB_ENV
 fi
-