Use bump and tag actions from drivers-github-tools

Author: alcaeus

.github/workflows/commit-and-tag.sh

@@ -93,24 +93,29 @@ jobs:
       # Preliminary checks done - commence the release process
       #
 
-      # This step creates the "Package x.y.z" commit that will be the base of
-      # our tag and creates the release tag. This is run inside the container in
-      # order to create signed git artifacts
-      - name: "Create package commit and release tag"
-        uses: mongodb-labs/drivers-github-tools/git-sign@v2
+      - name: "Create package commit"
+        uses: mongodb-labs/drivers-github-tools/bump-version@v2
         with:
-          command: "$(pwd)/.github/workflows/commit-and-tag.sh ${{ inputs.version }} ${{ env.GPG_KEY_ID }}"
-
-      # This step needs to happen outside of the container, as PHP is not
-      # available within.
-      - name: "Bump to next development release"
-        run: ./bin/update-release-version.php to-next-patch-dev
+          version: ${{ inputs.version }}
+          # Use get-version as a dummy as a version_bump_script is required
+          # We run the bump script manually earlier so we can sanity-check the version number and print nice output
+          version_bump_script: "./bin/update-release-version.php get-version"
+          commit_template: 'Package ${VERSION}'
+          # Don't push changes as we're creating a second commit later
+          push_commit: false
+
+      - name: "Create release tag"
+        uses: mongodb-labs/drivers-github-tools/tag-version@v2
+        with:
+          version: ${{ inputs.version }}
+          tag_message_template: 'Release ${VERSION}'
 
-      # Create a signed "back to -dev" commit, again inside the container
-      - name: "Create dev commit"
-        uses: mongodb-labs/drivers-github-tools/git-sign@v2
+      - name: "Bump to next development release and commit"
+        uses: mongodb-labs/drivers-github-tools/bump-version@v2
         with:
-          command: "git commit -m 'Back to -dev' -s --gpg-sign=${{ env.GPG_KEY_ID }} phongo_version.h"
+          version: ${{ inputs.version }}
+          version_bump_script: "./bin/update-release-version.php to-next-patch-dev"
+          commit_template: 'Back to -dev'
 
       # TODO: Manually merge using ours strategy. This avoids merge-up pull requests being created
       # Process is:
@@ -119,9 +124,6 @@ jobs:
       # 3. push next branch
       # 4. switch back to release branch, then push
 
-      - name: "Push changes from release branch"
-        run: git push
-
       - name: "Prepare release message"
         run: |
           cat > release-message <<'EOL'
@@ -131,9 +133,6 @@ jobs:
       - name: "Create draft release"
         run: echo "RELEASE_URL=$(gh release create ${{ inputs.version }} --target ${{ github.ref_name }} --title "${{ inputs.version }}" --notes-file release-message --draft)" >> "$GITHUB_ENV"
 
-      - name: "Push release tag"
-        run: git push origin ${{ inputs.version }}
-
       - name: "Set summary"
         run: |
           echo '🚀 Created tag and drafted release for version [${{ inputs.version }}](${{ env.RELEASE_URL }})' >> $GITHUB_STEP_SUMMARY

.github/workflows/release.yml

@@ -140,7 +140,8 @@ function get_next_minor_version(array $versions): array
     ];
 }
 
-if ($argc !== 2) {
+// Allow 2 arguments as the bump-version action always passes a version number, even when not needed
+if (! in_array($argc, [2, 3])) {
     usage();
 }
 
@@ -149,6 +150,7 @@ function get_next_minor_version(array $versions): array
 switch ($argv[1] ?? null) {
     case 'get-version':
         echo $currentVersion['version'];
+
         exit(0);
 
     case 'to-stable':
@@ -170,4 +172,3 @@ function get_next_minor_version(array $versions): array
 write_release_version(VERSION_FILENAME, $newVersion);
 
 printf("Updated version number in version file from %s to %s\n", $currentVersion['version'], $newVersion['version']);
-