Improve branch extraction naming, add npm scripts to bump docker tags

Author: andreiborza

action.yml

@@ -58,20 +58,6 @@ inputs:
 runs:
   using: 'composite'
   steps:
-#    - name: Extract tag to use for docker image
-#      if: runner.os == 'Linux'
-#      shell: bash
-#      run: |
-#        GIT_REF="${{ github.action_ref }}"
-#        if [[ "$GIT_REF" == refs/tags/* ]]; then
-#          DOCKER_TAG=${REF#refs/tags/}
-#        elif [[ "$GIT_REF" == refs/heads/* ]]; then
-#          DOCKER_TAG=${GIT_REF#refs/heads/}
-#        else
-#          DOCKER_TAG="master"
-#        fi
-#        echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
-
     # For actions running on a linux runner, we use a docker
     # approach as it's faster and encapsulates everything needed
     # to run the action.

dist/index.js

@@ -123585,7 +123585,7 @@ module.exports = JSON.parse('{"eN":{"H":"https://github.com/elastic/require-in-t
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"action-release","version":"1.10.5","private":true,"description":"GitHub Action for creating a release on Sentry","main":"dist/index.js","scripts":{"start":"node dist/index.js","build":"ncc build src/main.ts -e @sentry/cli","format":"prettier --write **/*.ts **/*.md","format-check":"prettier --check **/*.ts **/*.md","lint":"eslint src/**/*.ts","test":"jest","all":"yarn run format && yarn run lint && yarn run build && yarn test"},"repository":{"type":"git","url":"git+https://github.com/getsentry/action-release.git"},"keywords":["actions","sentry","release"],"author":"Sentry","license":"MIT","dependencies":{"@actions/core":"^1.11.1","@sentry/node":"^8.54.0","@sentry/cli":"^2.41.1"},"devDependencies":{"@types/jest":"^29.5.6","@types/node":"^20.8.9","@typescript-eslint/parser":"^6.9.0","@vercel/ncc":"^0.38.1","eslint":"^8.52.0","eslint-plugin-github":"^4.10.1","eslint-plugin-jest":"^27.4.3","jest":"^29.7.0","jest-circus":"^29.7.0","js-yaml":"^4.1.0","prettier":"^3.0.3","ts-jest":"^29.1.1","typescript":"^5.2.2"},"volta":{"node":"18.17.0","yarn":"1.22.4"}}');
+module.exports = JSON.parse('{"name":"action-release","version":"1.10.5","private":true,"description":"GitHub Action for creating a release on Sentry","main":"dist/index.js","scripts":{"start":"node dist/index.js","build":"ncc build src/main.ts -e @sentry/cli","format":"prettier --write **/*.ts **/*.md","format-check":"prettier --check **/*.ts **/*.md","lint":"eslint src/**/*.ts","test":"jest","all":"yarn run format && yarn run lint && yarn run build && yarn test","bump-docker-tag":"./scripts/set-docker-tag.sh","bump-docker-tag-from-branch":"./scripts/set-branch-docker-tag.sh"},"repository":{"type":"git","url":"git+https://github.com/getsentry/action-release.git"},"keywords":["actions","sentry","release"],"author":"Sentry","license":"MIT","dependencies":{"@actions/core":"^1.11.1","@sentry/node":"^8.54.0","@sentry/cli":"^2.41.1"},"devDependencies":{"@types/jest":"^29.5.6","@types/node":"^20.8.9","@typescript-eslint/parser":"^6.9.0","@vercel/ncc":"^0.38.1","eslint":"^8.52.0","eslint-plugin-github":"^4.10.1","eslint-plugin-jest":"^27.4.3","jest":"^29.7.0","jest-circus":"^29.7.0","js-yaml":"^4.1.0","prettier":"^3.0.3","ts-jest":"^29.1.1","typescript":"^5.2.2"},"volta":{"node":"18.17.0","yarn":"1.22.4"}}');
 
 /***/ })
 

package.json

@@ -11,7 +11,9 @@
     "format-check": "prettier --check **/*.ts **/*.md",
     "lint": "eslint src/**/*.ts",
     "test": "jest",
-    "all": "yarn run format && yarn run lint && yarn run build && yarn test"
+    "all": "yarn run format && yarn run lint && yarn run build && yarn test",
+    "bump-docker-tag": "./scripts/set-docker-tag.sh",
+    "bump-docker-tag-from-branch": "./scripts/set-branch-docker-tag.sh"
   },
   "repository": {
     "type": "git",

scripts/craft-pre-release.sh

@@ -18,4 +18,4 @@ npm version "${NEW_VERSION}"
 yarn install && yarn build
 
 # Update the docker tag in action.yml
-./scripts/set-docker-tag $NEW_VERSION
+yarn bump-docker-tag "${NEW_VERSION}"

scripts/set-branch-docker-tag.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 set -eux
 
-BRANCH=$(git rev-parse --abbrev-ref HEAD)
+# Extract the branch name from git and replace all non-alphanumerical characters with `-`
+BRANCH=$(git rev-parse --abbrev-ref HEAD | sed 's/[^a-zA-Z0-9-]/-/g')
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $SCRIPT_DIR