chore(deps): upgrade dependencies (#805)

Fixes failing upgrade workflows. Recent changes in upstream projen caused our release hacks to fail. Refactored the workspace release component to be less hacky.
cdklabs · Jan 8, 2024 · 367cc93 · 367cc93
1 parent 65219f2
commit 367cc93
Show file tree

Hide file tree

Showing 34 changed files with 165 additions and 175 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.npmignore b/.npmignore
diff --git a/package.json b/package.json
diff --git a/packages/@aws-cdk/aws-service-spec/.gitignore b/packages/@aws-cdk/aws-service-spec/.gitignore
diff --git a/packages/@aws-cdk/aws-service-spec/.npmignore b/packages/@aws-cdk/aws-service-spec/.npmignore
diff --git a/packages/@aws-cdk/aws-service-spec/.projen/tasks.json b/packages/@aws-cdk/aws-service-spec/.projen/tasks.json
diff --git a/packages/@aws-cdk/aws-service-spec/package.json b/packages/@aws-cdk/aws-service-spec/package.json
diff --git a/packages/@aws-cdk/aws-service-spec/tsconfig.dev.json b/packages/@aws-cdk/aws-service-spec/tsconfig.dev.json
diff --git a/packages/@aws-cdk/service-spec-importers/.gitignore b/packages/@aws-cdk/service-spec-importers/.gitignore
diff --git a/packages/@aws-cdk/service-spec-importers/.npmignore b/packages/@aws-cdk/service-spec-importers/.npmignore
diff --git a/packages/@aws-cdk/service-spec-importers/.projen/tasks.json b/packages/@aws-cdk/service-spec-importers/.projen/tasks.json
diff --git a/packages/@aws-cdk/service-spec-importers/package.json b/packages/@aws-cdk/service-spec-importers/package.json
diff --git a/packages/@aws-cdk/service-spec-importers/tsconfig.dev.json b/packages/@aws-cdk/service-spec-importers/tsconfig.dev.json
diff --git a/packages/@aws-cdk/service-spec-types/.gitignore b/packages/@aws-cdk/service-spec-types/.gitignore
diff --git a/packages/@aws-cdk/service-spec-types/.npmignore b/packages/@aws-cdk/service-spec-types/.npmignore
diff --git a/packages/@aws-cdk/service-spec-types/.projen/tasks.json b/packages/@aws-cdk/service-spec-types/.projen/tasks.json
diff --git a/packages/@aws-cdk/service-spec-types/package.json b/packages/@aws-cdk/service-spec-types/package.json
diff --git a/packages/@aws-cdk/service-spec-types/tsconfig.dev.json b/packages/@aws-cdk/service-spec-types/tsconfig.dev.json
diff --git a/packages/@cdklabs/tskb/.gitignore b/packages/@cdklabs/tskb/.gitignore
diff --git a/packages/@cdklabs/tskb/.npmignore b/packages/@cdklabs/tskb/.npmignore
diff --git a/packages/@cdklabs/tskb/.projen/tasks.json b/packages/@cdklabs/tskb/.projen/tasks.json
diff --git a/packages/@cdklabs/tskb/package.json b/packages/@cdklabs/tskb/package.json
diff --git a/packages/@cdklabs/tskb/tsconfig.dev.json b/packages/@cdklabs/tskb/tsconfig.dev.json
diff --git a/packages/@cdklabs/typewriter/.gitignore b/packages/@cdklabs/typewriter/.gitignore
diff --git a/packages/@cdklabs/typewriter/.npmignore b/packages/@cdklabs/typewriter/.npmignore
diff --git a/packages/@cdklabs/typewriter/.projen/tasks.json b/packages/@cdklabs/typewriter/.projen/tasks.json
diff --git a/packages/@cdklabs/typewriter/package.json b/packages/@cdklabs/typewriter/package.json
diff --git a/packages/@cdklabs/typewriter/tsconfig.dev.json b/packages/@cdklabs/typewriter/tsconfig.dev.json
diff --git a/projenrc/monorepo-release.ts b/projenrc/monorepo-release.ts
@@ -56,7 +56,10 @@ export class MonorepoRelease extends Component {
   private readonly releaseTrigger: release.ReleaseTrigger;
   private readonly packagesToRelease = new Array<{
     readonly workspaceDirectory: string;
-    readonly release: release.Release;
+    readonly release: {
+      readonly project: TypeScriptWorkspace;
+      readonly publisher: release.Publisher;
+    };
   }>();
 
   private workflow?: github.TaskWorkflow;
@@ -79,12 +82,15 @@ export class MonorepoRelease extends Component {
       publishToNpm: this.options.publishToNpm,
       ...options,
     });
-    if (!options.private && workspaceRelease.release) {
+    if (!options.private && workspaceRelease.publisher) {
       this.obtainReleaseTask();
 
       this.packagesToRelease.push({
         workspaceDirectory: project.workspaceDirectory,
-        release: workspaceRelease.release,
+        release: {
+          project: workspaceRelease.project,
+          publisher: workspaceRelease.publisher,
+        },
       });
     }
   }
@@ -110,7 +116,7 @@ export class MonorepoRelease extends Component {
           name: `${release.project.name}: Backup artifact permissions`,
           if: noNewCommits,
           continueOnError: true,
-          run: `cd ${release.artifactsDirectory} && getfacl -R . > ${PERMISSION_BACKUP_FILE}`,
+          run: `cd ${release.project.artifactsDirectory} && getfacl -R . > ${PERMISSION_BACKUP_FILE}`,
           workingDirectory: workspaceDirectory,
         },
         {
@@ -120,7 +126,7 @@ export class MonorepoRelease extends Component {
           with: {
             // Every artifact must have a unique name
             name: buildArtifactName(release.project),
-            path: path.join(workspaceDirectory, release.artifactsDirectory),
+            path: path.join(workspaceDirectory, release.project.artifactsDirectory),
           },
         },
       );
@@ -290,7 +296,7 @@ export class MonorepoRelease extends Component {
       checkoutWith: {
         // we must use 'fetch-depth=0' in order to fetch all tags
         // otherwise tags are not checked out
-        'fetch-depth': 0,
+        fetchDepth: 0,
       },
       preBuildSteps,
       task: this.releaseTask!,