Add hotfix workflow

Author: ryanjbaxter

.github/workflows/create-commercial-branch.yml

@@ -45,36 +45,12 @@ permissions:
   contents: read
 
 jobs:
-  # Derive the commercial repo and branch names from the OSS inputs.
-  derive:
-    runs-on: ubuntu-latest
-    outputs:
-      commercial_repo:   ${{ steps.derive.outputs.commercial_repo }}
-      commercial_branch: ${{ steps.derive.outputs.commercial_branch }}
-    steps:
-      - name: Derive commercial repo and branch
-        id: derive
-        shell: bash
-        run: |
-          OSS_REPO="${{ inputs.oss_repo }}"
-          OSS_BRANCH="${{ inputs.oss_branch }}"
-          # commercial repo is always the OSS repo with -commercial appended
-          COMMERCIAL_REPO="${OSS_REPO}-commercial"
-          echo "commercial_repo=${COMMERCIAL_REPO}"   >> "$GITHUB_OUTPUT"
-          echo "commercial_branch=${OSS_BRANCH}"      >> "$GITHUB_OUTPUT"
-          echo "OSS repo:          $OSS_REPO"
-          echo "OSS branch:        $OSS_BRANCH"
-          echo "Commercial repo:   $COMMERCIAL_REPO"
-          echo "Commercial branch: $OSS_BRANCH"
-
   initialize:
-    needs: derive
     uses: ./.github/workflows/initialize-commercial-branch.yml
     with:
-      oss_repo:          ${{ inputs.oss_repo }}
-      oss_branch:        ${{ inputs.oss_branch }}
-      commercial_repo:   ${{ needs.derive.outputs.commercial_repo }}
-      commercial_branch: ${{ needs.derive.outputs.commercial_branch }}
+      oss_repo:           ${{ inputs.oss_repo }}
+      oss_branch:         ${{ inputs.oss_branch }}
+      commercial_repo:    ${{ format('{0}-commercial', inputs.oss_repo) }}
+      commercial_branch:  ${{ inputs.oss_branch }}
       set_default_branch: ${{ inputs.set_default_branch }}
-    secrets:
-      token: ${{ secrets.token || secrets.GH_ACTIONS_REPO_TOKEN }}
+    secrets: inherit

.github/workflows/create-hotfix-branch.yml

@@ -37,38 +37,12 @@ permissions:
   contents: read
 
 jobs:
-  # Derive the commercial repo and branch names from the OSS inputs.
-  derive:
-    runs-on: ubuntu-latest
-    outputs:
-      commercial_repo:   ${{ steps.derive.outputs.commercial_repo }}
-      commercial_branch: ${{ steps.derive.outputs.commercial_branch }}
-    steps:
-      - name: Derive commercial repo and branch
-        id: derive
-        shell: bash
-        run: |
-          OSS_REPO="${{ inputs.oss_repo }}"
-          OSS_TAG="${{ inputs.oss_tag }}"
-          # commercial repo is always the OSS repo with -commercial appended
-          COMMERCIAL_REPO="${OSS_REPO}-commercial"
-          # strip leading 'v' and append '.x'  (v5.0.1 -> 5.0.1.x)
-          COMMERCIAL_BRANCH="${OSS_TAG#v}.x"
-          echo "commercial_repo=${COMMERCIAL_REPO}"     >> "$GITHUB_OUTPUT"
-          echo "commercial_branch=${COMMERCIAL_BRANCH}" >> "$GITHUB_OUTPUT"
-          echo "OSS repo:          $OSS_REPO"
-          echo "OSS tag:           $OSS_TAG"
-          echo "Commercial repo:   $COMMERCIAL_REPO"
-          echo "Commercial branch: $COMMERCIAL_BRANCH"
-
   initialize:
-    needs: derive
     uses: ./.github/workflows/initialize-commercial-branch.yml
     with:
-      oss_repo:          ${{ inputs.oss_repo }}
-      oss_tag:           ${{ inputs.oss_tag }}
-      commercial_repo:   ${{ needs.derive.outputs.commercial_repo }}
-      commercial_branch: ${{ needs.derive.outputs.commercial_branch }}
+      oss_repo:           ${{ inputs.oss_repo }}
+      oss_tag:            ${{ inputs.oss_tag }}
+      commercial_repo:    ${{ format('{0}-commercial', inputs.oss_repo) }}
+      commercial_branch:  ${{ format('{0}.x', replace(inputs.oss_tag, 'v', '')) }}
       set_default_branch: false
-    secrets:
-      token: ${{ secrets.token || secrets.GH_ACTIONS_REPO_TOKEN }}
+    secrets: inherit