Merge remote-tracking branch 'origin/main' into gnunicorn/issue833

.github/workflows/prep-crypto-nodejs-release.yml

@@ -36,10 +36,13 @@ env:
 
 jobs:
   prepare-release:
-    name: "Package nodejs package"
+    name: "Preparing crypto-nodejs release tag"
     runs-on: ubuntu-latest
+    outputs:
+      tag: "${{ env.TAG_PREFIX }}${{ inputs.version }}"
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
 
       # Generate changelog since last tag, if given
       - name: Generate a changelog for upload
@@ -65,16 +68,15 @@ jobs:
 
       - name: Set version
         id: package_version
-        uses: KageKirin/set-node-package-version@v0
-        with:
-          version: ${{ inputs.version }}
+        working-directory: ${{ env.PKG_PATH }}
+        run: npm version ${{ inputs.version }}
 
       - uses: EndBug/add-and-commit@v9
         with:
           default_author: github_actions
           message: "Tagging Crypto-Node.js for release"
           tag: "${{env.TAG_PREFIX}}${{ inputs.version }}"
-          new_banch: "gh-action/release-${{ env.TAG_PREFIX }}${{ inputs.version }}"
+          new_branch: "gh-action/release-${{ env.TAG_PREFIX }}${{ inputs.version }}"
           push: true
           add: |
             ${{ env.PKG_PATH }}/package.json
@@ -91,18 +93,25 @@ jobs:
 
       # no changes, use the default changelog for the body
       - name: Update Github Release notes
-        if: !inputs.previous_version
+        if: ${{!inputs.previous_version}}
         uses: softprops/action-gh-release@v1
         with:
           draft: true
           tag_name: ${{ env.TAG_PREFIX }}${{ inputs.version }}
           body_path: "${{ env.PKG_PATH }}/CHANGELOG.md"
 
-      # finally, let's create a PR for all this, too
+      # let's create a PR for all this, too
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v4
         with:
-          branch: "gh-action/release-${{ env.TAG_PREFIX }}${{ inputs.version }}"
           title: "Preparing Release ${{ env.TAG_PREFIX }}${{ inputs.version }}"
           body: |
-            Automatic Pull-Request to merge release ${{ env.TAG_PREFIX }}${{ inputs.version }} back into main
+            Automatic Pull-Request to merge release ${{ env.TAG_PREFIX }}${{ inputs.version }}
+
+  trigger-release:
+    # and trigger the tagging release workflow
+    uses: matrix-org/matrix-rust-sdk/.github/workflows/release-crypto-nodejs.yml@main
+    needs: ['prepare-release']
+    name: "Trigger release Workflow"
+    with:
+      tag: ${{needs.prepare-release.outputs.tag}}

.github/workflows/release-crypto-nodejs.yml

@@ -21,7 +21,12 @@ on:
   push:
     tags:
       - matrix-sdk-crypto-nodejs-v[0-9]+.*
-
+  workflow_call:
+    inputs:
+      tag:
+        description: "The tag to build with"
+        required: true
+        type: string
 jobs:
   upload-assets:
     name: "Upload prebuilt libraries"
@@ -57,7 +62,15 @@ jobs:
             os: windows-latest
     runs-on: ${{ matrix.os }}
     steps:
+      # use the given tag
       - uses: actions/checkout@v3
+        name: "Checking out ${{ inputs.tag }}"
+        if: "${{ inputs.tag }}"
+        with:
+          ref: ${{ inputs.tag }}
+      # use the default
+      - uses: actions/checkout@v3
+        if: "${{ !inputs.tag }}"
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
@@ -90,7 +103,15 @@ jobs:
     needs:
       - upload-assets
     steps:
+      # use the given tag
       - uses: actions/checkout@v3
+        name: "Checking out ${{ inputs.tag }}"
+        if: "${{ inputs.tag }}"
+        with:
+          ref: ${{ inputs.tag }}
+      # use the default
+      - uses: actions/checkout@v3
+        if: "${{ !inputs.tag }}"
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
@@ -113,4 +134,6 @@ jobs:
       - name: Publish to npmjs.com
         uses: JS-DevTools/npm-publish@v1
         with:
+          package: ${{env.PKG_PATH}}/package.json
+          access: public
           token: ${{ secrets.NPM_TOKEN }}