Merge branch 'main' into fix/deepmerge-shared-references

Author: svozza

.github/scripts/constants.js

@@ -1,4 +1,5 @@
-const { LABEL_PENDING_RELEASE, LABEL_RELEASED } = require('./constants');
+const LABEL_PENDING_RELEASE = 'pending-release';
+const LABEL_RELEASED = 'completed';
 
 /**
  * Fetch issues using GitHub REST API
@@ -37,26 +38,17 @@ const fetchIssues = async ({
 };
 
 /**
- * Notify new release and close staged GitHub issue
+ * Update labels on closed issues that are pending release
+ *
+ * Swaps the 'pending-release' label to 'completed' on each closed issue.
+ * GitHub natively links releases to issues, so no comment is needed.
  *
  * @param {object} gh_client - Pre-authenticated REST client (Octokit)
  * @param {string} owner - GitHub Organization
  * @param {string} repository - GitHub repository
- * @param {string} release_version - GitHub Release version
  * @see {@link https://octokit.github.io/rest.js/v18#usage|Octokit client}
  */
-const notifyRelease = async ({
-  gh_client,
-  core,
-  owner,
-  repository,
-  release_version,
-}) => {
-  const release_url = `https://github.com/${owner}/${repository}/releases/tag/v${release_version.replace(
-    /v/g,
-    ''
-  )}`;
-
+const updateLabels = async ({ gh_client, core, owner, repository }) => {
   const issues = await fetchIssues({
     gh_client: gh_client,
     org: owner,
@@ -65,22 +57,7 @@ const notifyRelease = async ({
   });
 
   issues.forEach(async (issue) => {
-    core.info(`Updating issue number ${issue.number}`);
-
-    const comment = `This is now released under [${release_version}](${release_url}) version!`;
-    try {
-      await gh_client.rest.issues.createComment({
-        owner: owner,
-        repo: repository,
-        body: comment,
-        issue_number: issue.number,
-      });
-    } catch (error) {
-      core.setFailed(error);
-      throw new Error(
-        `Failed to update issue ${issue.number} about ${release_version} release`
-      );
-    }
+    core.info(`Updating labels for issue number ${issue.number}`);
 
     // Remove staged label; keep existing ones
     const labels = issue.labels
@@ -106,14 +83,12 @@ const notifyRelease = async ({
 
 // context: https://github.com/actions/toolkit/blob/main/packages/github/src/context.ts
 module.exports = async ({ github, context, core }) => {
-  const { RELEASE_VERSION } = process.env;
-  core.info(`Running post-release script for ${RELEASE_VERSION} version`);
+  core.info('Running post-release label update');
 
-  await notifyRelease({
+  await updateLabels({
     gh_client: github,
     core,
     owner: context.repo.owner,
     repository: context.repo.repo,
-    release_version: RELEASE_VERSION,
   });
 };

.github/scripts/post_release.js

@@ -44,6 +44,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+        uses: github/codeql-action/upload-sarif@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
         with:
           sarif_file: results.sarif

.github/workflows/ossf_scorecard.yml

@@ -2,12 +2,7 @@ name: Post Release
 
 on:
   # Triggered manually
-  workflow_dispatch:
-    inputs:
-      versionNumber:
-        required: true
-        type: string
-        description: "If running this manually please insert a version number that corresponds to the latest published in the GitHub releases (i.e. v1.1.1)"
+  workflow_dispatch: {}
   # Or triggered as result of a release
   release:
     types: [released]
@@ -20,26 +15,13 @@ jobs:
     permissions:
       contents: read
       issues: write
-      discussions: write
-      pull-requests: write
     runs-on: ubuntu-latest
-    env:
-      RELEASE_VERSION: ${{ inputs.versionNumber }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
-      - name: Get release version
-        run: |
-          # The code below does the following:
-          # 1. If the workflow was triggered manually, it will use the version number provided by the user
-          # 2. If the workflow was triggered by a release, it will use the version number of the release
-          if [ -z "$RELEASE_VERSION" ]; then
-            export RELEASE_VERSION=$(git describe --tags --abbrev=0)
-          fi
-          echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_ENV
-      - name: Update issues related to release
+      - name: Update labels on issues related to release
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const post_release = require('.github/scripts/post_release.js')
-            await post_release({github, context, core})
+            await post_release({github, context, core})

.github/workflows/post-release.yml

@@ -34,7 +34,7 @@
     "aws-cdk-lib": "^2.244.0",
     "constructs": "^10.6.0",
     "source-map-support": "^0.5.21",
-    "typescript": "^6.0.2",
+    "typescript": "^6.0.3",
     "vitest": "^4.0.10"
   },
   "dependencies": {
@@ -52,6 +52,6 @@
     "aws-cdk": "^2.1113.0",
     "constructs": "^10.6.0",
     "esbuild": "^0.28.0",
-    "typescript": "^6.0.2"
+    "typescript": "^6.0.3"
   }
 }

examples/app/package.json

@@ -63,7 +63,7 @@
     "middy7": "npm:@middy/core@^7.0.2",
     "typedoc": "^0.28.19",
     "typedoc-plugin-missing-exports": "^4.1.3",
-    "typescript": "^6.0.2",
+    "typescript": "^6.0.3",
     "vitest": "^4.1.2"
   },
   "lint-staged": {

package-lock.json

@@ -155,7 +155,7 @@
     "@aws-sdk/client-dynamodb": "^3.1014.0",
     "@aws-sdk/lib-dynamodb": "^3.1014.0",
     "@aws-sdk/util-dynamodb": "^3.996.2",
-    "@aws/durable-execution-sdk-js": "^1.1.0",
+    "@aws/durable-execution-sdk-js": "^1.1.1",
     "aws-sdk-client-mock": "^4.1.0"
   }
 }