Merge pull request #1893 from kristof-mattei/lowercase-variable-names

chore: consolidation of scripts

Author: kristof-mattei

.github/workflows/build.yml

@@ -17,6 +17,7 @@ permissions:
   packages: write
 
 env:
+  CARGO_TERM_COLOR: always
   # set this to true in GitHub variables to enable building the container
   # HAS_CONTAINER: true
   # Use docker.io for Docker Hub if empty
@@ -145,7 +146,7 @@ jobs:
         run: |
           version="$(cog bump --auto --dry-run || true)"
 
-          if [[ "$version" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+          if [[ "${version}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
               echo "New version: ${version}"
           else
               version="v$(cog -v get-version)"

.github/workflows/publish-crate-after-release.yml

@@ -1,7 +1,5 @@
 name: Publish crate
 
-env: {}
-
 concurrency:
   group: "${{ github.workflow }}"
   cancel-in-progress: false # last one must win in case of multiple releases
@@ -14,6 +12,9 @@ on:
 permissions:
   contents: read
 
+env:
+  CARGO_TERM_COLOR: always
+
 jobs:
   repo-has-crate:
     name: Repo publishes crate?

.github/workflows/release.yml

@@ -1,11 +1,5 @@
 name: Release
 
-env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
-
 concurrency:
   group: "${{ github.workflow }}"
   cancel-in-progress: true # only last step is important, which runs or doesn't
@@ -19,6 +13,13 @@ permissions:
   issues: write
   pull-requests: write
 
+env:
+  CARGO_TERM_COLOR: always
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+
 jobs:
   release:
     name: Release
@@ -101,8 +102,8 @@ jobs:
 
           cog bump --auto
 
-          VERSION="v$(cog -v get-version)"
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          version="v$(cog -v get-version)"
+          echo "version=$version" >> ${GITHUB_OUTPUT}
 
           git push
 

.github/workflows/retag-containers-after-push.yml

@@ -1,13 +1,5 @@
 name: Retag containers after new push / PR
 
-env:
-  # set this to true in GitHub variables to enable building the container
-  # HAS_CONTAINER: true
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
-
 concurrency:
   group: "${{ github.workflow }}" # last one must win
   cancel-in-progress: false # no we need them
@@ -31,6 +23,15 @@ permissions:
   contents: write
   packages: write
 
+env:
+  CARGO_TERM_COLOR: always
+  # set this to true in GitHub variables to enable building the container
+  # HAS_CONTAINER: true
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+
 jobs:
   repo-has-container:
     name: Repo has container?
@@ -76,6 +77,7 @@ jobs:
 
           else
             echo "The incoming push isn't a merge, ergo it's not a PR"
+            exit 1
           fi
 
       - name: Download crane tar, extract, and add folder to path.
@@ -152,13 +154,13 @@ jobs:
         run: |
           # search for the tag, there can only be zero or one match
           # we need the || true because otherwise grep returns exit code 1 and github actions then dies
-          pr_tag_found=$(cat existing_tags | grep -c "^${PR_TAG}\$") || true
+          pr_tag_found=$(cat existing_tags | grep -c "^${{ env.PR_TAG }}\$") || true
 
           if [ $pr_tag_found -eq 1 ]
           then
             echo "Incoming PR produced a Docker image"
 
-            echo "OLD_TAG=${PR_TAG}" >> ${GITHUB_ENV}
+            echo "OLD_TAG=${{ env.PR_TAG }}" >> ${GITHUB_ENV}
             echo "SUFFIX=actual" >> ${GITHUB_ENV}
           else
             # If we don't have an old tag, then the incoming PR didn't produce a container.

.github/workflows/retag-containers-after-release.yml

@@ -1,11 +1,5 @@
 name: Update semantic tags on repo & image after release
 
-env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
-
 concurrency:
   group: "${{ github.workflow }}"
   cancel-in-progress: false # last one must win in case of multiple releases
@@ -19,6 +13,13 @@ permissions:
   contents: write
   packages: write
 
+env:
+  CARGO_TERM_COLOR: always
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+
 jobs:
   repo-has-container:
     name: Repo has container?

.github/workflows/test-release.yml

@@ -1,11 +1,5 @@
 name: Test Release
 
-env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
-
 on:
   workflow_dispatch: # releasing is manual as we don't want to release every time
 
@@ -14,6 +8,13 @@ permissions:
   issues: read
   pull-requests: read
 
+env:
+  CARGO_TERM_COLOR: always
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+
 jobs:
   test-release:
     name: Test Release