chore(workflow): apply code review feedback

Author: stefaniuk

.github/workflows/cicd-2-publish.yaml

@@ -23,8 +23,8 @@ jobs:
         uses: actions/create-github-app-token@v2
         id: app-token
         with:
-          app-id: ${{ vars.GH_VERSIONING_APP_ID != '' && vars.GH_VERSIONING_APP_ID || vars.NHS_GH_VERSIONING_APP_ID }}
-          private-key: ${{ secrets.GH_VERSIONING_APP_PRIVATE_KEY != '' && secrets.GH_VERSIONING_APP_PRIVATE_KEY || secrets.NHS_GH_VERSIONING_APP_PRIVATE_KEY }}
+          app-id: ${{ vars.GH_VERSIONING_APP_ID || vars.NHS_GH_VERSIONING_APP_ID }}
+          private-key: ${{ secrets.GH_VERSIONING_APP_PRIVATE_KEY || secrets.NHS_GH_VERSIONING_APP_PRIVATE_KEY }}
 
       - name: "🙈 Mask App token"
         run: echo "::add-mask::${{ steps.app-token.outputs.token }}"
@@ -38,10 +38,10 @@ jobs:
 
       - name: "🔏 Import and configure commit signing key"
         env:
-          GIT_USER_NAME: ${{ vars.GIT_SIGNING_BOT_NAME != '' && vars.GIT_SIGNING_BOT_NAME || vars.NHS_GIT_SIGNING_BOT_NAME }}
-          GIT_USER_EMAIL: ${{ vars.GIT_SIGNING_BOT_EMAIL != '' && vars.GIT_SIGNING_BOT_EMAIL || vars.NHS_GIT_SIGNING_BOT_EMAIL }}
-          GPG_PKEY: ${{ secrets.GIT_SIGNING_BOT_GPG_PRIVATE_KEY != '' && secrets.GIT_SIGNING_BOT_GPG_PRIVATE_KEY || secrets.NHS_GIT_SIGNING_BOT_GPG_PRIVATE_KEY }}
-          GPG_PASS: ${{ secrets.GIT_SIGNING_BOT_GPG_PASSPHRASE != '' && secrets.GIT_SIGNING_BOT_GPG_PASSPHRASE || secrets.NHS_GIT_SIGNING_BOT_GPG_PASSPHRASE }}
+          GIT_USER_NAME: ${{ vars.GIT_SIGNING_BOT_NAME || vars.NHS_GIT_SIGNING_BOT_NAME }}
+          GIT_USER_EMAIL: ${{ vars.GIT_SIGNING_BOT_EMAIL || vars.NHS_GIT_SIGNING_BOT_EMAIL }}
+          GPG_PKEY: ${{ secrets.GIT_SIGNING_BOT_GPG_PRIVATE_KEY || secrets.NHS_GIT_SIGNING_BOT_GPG_PRIVATE_KEY }}
+          GPG_PASS: ${{ secrets.GIT_SIGNING_BOT_GPG_PASSPHRASE || secrets.NHS_GIT_SIGNING_BOT_GPG_PASSPHRASE }}
         run: |
           mkdir -p ~/.gnupg
           chmod 700 ~/.gnupg
@@ -77,10 +77,10 @@ jobs:
             conventional-changelog-conventionalcommits
         env:
           GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
-          GIT_AUTHOR_NAME: ${{ vars.GIT_SIGNING_BOT_NAME != '' && vars.GIT_SIGNING_BOT_NAME || vars.NHS_GIT_SIGNING_BOT_NAME }}
-          GIT_AUTHOR_EMAIL: ${{ vars.GIT_SIGNING_BOT_EMAIL != '' && vars.GIT_SIGNING_BOT_EMAIL || vars.NHS_GIT_SIGNING_BOT_EMAIL }}
-          GIT_COMMITTER_NAME: ${{ vars.GIT_SIGNING_BOT_NAME != '' && vars.GIT_SIGNING_BOT_NAME || vars.NHS_GIT_SIGNING_BOT_NAME }}
-          GIT_COMMITTER_EMAIL: ${{ vars.GIT_SIGNING_BOT_EMAIL != '' && vars.GIT_SIGNING_BOT_EMAIL || vars.NHS_GIT_SIGNING_BOT_EMAIL }}
+          GIT_AUTHOR_NAME: ${{ vars.GIT_SIGNING_BOT_NAME || vars.NHS_GIT_SIGNING_BOT_NAME }}
+          GIT_AUTHOR_EMAIL: ${{ vars.GIT_SIGNING_BOT_EMAIL || vars.NHS_GIT_SIGNING_BOT_EMAIL }}
+          GIT_COMMITTER_NAME: ${{ vars.GIT_SIGNING_BOT_NAME || vars.NHS_GIT_SIGNING_BOT_NAME }}
+          GIT_COMMITTER_EMAIL: ${{ vars.GIT_SIGNING_BOT_EMAIL || vars.NHS_GIT_SIGNING_BOT_EMAIL }}
 
       - name: "🔑 Login to GitHub Container Registry"
         uses: docker/login-action@v3

README.md

@@ -104,7 +104,7 @@ Repository secrets provide the credentials and cryptographic materials required
 - `GIT_SIGNING_BOT_GPG_PRIVATE_KEY` - private signing key of your release bot
 - `GIT_SIGNING_BOT_GPG_PASSPHRASE` - the key passphrase
 
-All of the above variables and secrets has an orgnisation-wide
+All of the above variables and secrets has an organisation-wide
 
 ## Prerequisites