chore: fix minor workflow issues (#365)

cdktf · Dec 4, 2023 · a3fc700 · a3fc700
1 parent c37e055
commit a3fc700
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 16 deletions.
diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
diff --git a/.projen/deps.json b/.projen/deps.json
diff --git a/.projen/tasks.json b/.projen/tasks.json
diff --git a/.projenrc.ts b/.projenrc.ts
@@ -32,6 +32,7 @@ const project = new cdk.JsiiProject({
   licensed: false, // we do supply our own license file with a custom header
   pullRequestTemplate: false,
   jsiiVersion: "~5.2.0",
+  typescriptVersion: "~5.2.0", // should always be the same major/minor as JSII
   peerDeps: ["projen@^0.77.2", "constructs@^10.3.0"],
   deps: ["change-case", "fs-extra"],
   devDeps: ["@types/fs-extra", "glob"],

diff --git a/src/auto-approve.ts b/src/auto-approve.ts
@@ -21,6 +21,8 @@ export class AutoApprove {
       },
     });
 
+    (workflow.concurrency as any) = "${{ github.workflow }}-${{ github.ref }}";
+
     const maintainerStatuses = `fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]')`;
     workflow.addJobs({
       approve: {

diff --git a/src/force-release.ts b/src/force-release.ts
@@ -62,7 +62,9 @@ export class ForceRelease {
         {
           name: "Setup Node.js",
           uses: "actions/setup-node",
-          with: { "node-version": "16.14.0" },
+          with: {
+            "node-version": project.minNodeVersion,
+          },
         },
         {
           name: "Install dependencies",
@@ -96,7 +98,9 @@ export class ForceRelease {
         {
           name: "Setup Node.js",
           uses: "actions/setup-node",
-          with: { "node-version": "16.14.0" },
+          with: {
+            "node-version": project.minNodeVersion,
+          },
         },
         {
           name: "Setup Go",

diff --git a/test/__snapshots__/index.test.ts.snap b/test/__snapshots__/index.test.ts.snap