From 130009c67eff4828017f56b8eb01a2c5f336e723 Mon Sep 17 00:00:00 2001
From: Rico Huijbers <rix0rrr@gmail.com>
Date: Wed, 19 Feb 2025 19:33:59 +0100
Subject: [PATCH 1/3] chore: fix jsii publishing in a monorepo

We were cd'ing into the wrong directories.
---
 .github/workflows/release.yml | 44 +++++++++++++++++------------------
 projenrc/jsii.ts              |  4 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 845b1d07c..4b6c219d6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -190,9 +190,9 @@ jobs:
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create js artifact
-        run: cd .repo && npx projen package:js
+        run: cd .repo/packages/@aws-cdk/cloud-assembly-schema && npx projen package:js
       - name: Collect js artifact
-        run: mv .repo/dist dist
+        run: mv .repo/packages/@aws-cdk/cloud-assembly-schema/dist dist
       - name: Release
         env:
           NPM_DIST_TAG: latest
@@ -234,9 +234,9 @@ jobs:
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create java artifact
-        run: cd .repo && npx projen package:java
+        run: cd .repo/packages/@aws-cdk/cloud-assembly-schema && npx projen package:java
       - name: Collect java artifact
-        run: mv .repo/dist dist
+        run: mv .repo/packages/@aws-cdk/cloud-assembly-schema/dist dist
       - name: Release
         env:
           MAVEN_ENDPOINT: https://aws.oss.sonatype.org
@@ -279,9 +279,9 @@ jobs:
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create python artifact
-        run: cd .repo && npx projen package:python
+        run: cd .repo/packages/@aws-cdk/cloud-assembly-schema && npx projen package:python
       - name: Collect python artifact
-        run: mv .repo/dist dist
+        run: mv .repo/packages/@aws-cdk/cloud-assembly-schema/dist dist
       - name: Release
         env:
           TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
@@ -320,9 +320,9 @@ jobs:
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create dotnet artifact
-        run: cd .repo && npx projen package:dotnet
+        run: cd .repo/packages/@aws-cdk/cloud-assembly-schema && npx projen package:dotnet
       - name: Collect dotnet artifact
-        run: mv .repo/dist dist
+        run: mv .repo/packages/@aws-cdk/cloud-assembly-schema/dist dist
       - name: Release
         env:
           NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
@@ -360,9 +360,9 @@ jobs:
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create go artifact
-        run: cd .repo && npx projen package:go
+        run: cd .repo/packages/@aws-cdk/cloud-assembly-schema && npx projen package:go
       - name: Collect go artifact
-        run: mv .repo/dist dist
+        run: mv .repo/packages/@aws-cdk/cloud-assembly-schema/dist dist
       - name: Release
         env:
           GIT_USER_NAME: github-actions
@@ -447,7 +447,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_REPOSITORY: ${{ github.repository }}
           GITHUB_REF: ${{ github.sha }}
-        run: errout=$(mktemp); gh release create $(cat dist/releasetag.txt) -R $GITHUB_REPOSITORY -F dist/changelog.md -t $(cat dist/releasetag.txt) --target $GITHUB_REF -p 2> $errout && true; exitcode=$?; if [ $exitcode -ne 0 ] && ! grep -q "Release.tag_name already exists" $errout; then cat $errout; exit $exitcode; fi
+        run: errout=$(mktemp); gh release create $(cat dist/releasetag.txt) -R $GITHUB_REPOSITORY -F dist/changelog.md -t $(cat dist/releasetag.txt) --target $GITHUB_REF 2> $errout && true; exitcode=$?; if [ $exitcode -ne 0 ] && ! grep -q "Release.tag_name already exists" $errout; then cat $errout; exit $exitcode; fi
   cdk-assets_release_npm:
     name: "cdk-assets: Publish to npm"
     needs: release
@@ -469,7 +469,7 @@ jobs:
         continue-on-error: true
       - name: Release
         env:
-          NPM_DIST_TAG: v3-latest
+          NPM_DIST_TAG: latest
           NPM_REGISTRY: registry.npmjs.org
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: npx -p publib@latest publib-npm
@@ -587,9 +587,9 @@ jobs:
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create js artifact
-        run: cd .repo && npx projen package:js
+        run: cd .repo/packages/@aws-cdk/cli-lib-alpha && npx projen package:js
       - name: Collect js artifact
-        run: mv .repo/dist dist
+        run: mv .repo/packages/@aws-cdk/cli-lib-alpha/dist dist
       - name: Release
         env:
           NPM_DIST_TAG: latest
@@ -631,9 +631,9 @@ jobs:
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create java artifact
-        run: cd .repo && npx projen package:java
+        run: cd .repo/packages/@aws-cdk/cli-lib-alpha && npx projen package:java
       - name: Collect java artifact
-        run: mv .repo/dist dist
+        run: mv .repo/packages/@aws-cdk/cli-lib-alpha/dist dist
       - name: Release
         env:
           MAVEN_GPG_PRIVATE_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
@@ -675,9 +675,9 @@ jobs:
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create python artifact
-        run: cd .repo && npx projen package:python
+        run: cd .repo/packages/@aws-cdk/cli-lib-alpha && npx projen package:python
       - name: Collect python artifact
-        run: mv .repo/dist dist
+        run: mv .repo/packages/@aws-cdk/cli-lib-alpha/dist dist
       - name: Release
         env:
           TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
@@ -716,9 +716,9 @@ jobs:
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create dotnet artifact
-        run: cd .repo && npx projen package:dotnet
+        run: cd .repo/packages/@aws-cdk/cli-lib-alpha && npx projen package:dotnet
       - name: Collect dotnet artifact
-        run: mv .repo/dist dist
+        run: mv .repo/packages/@aws-cdk/cli-lib-alpha/dist dist
       - name: Release
         env:
           NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
@@ -756,9 +756,9 @@ jobs:
       - name: Move build artifact out of the way
         run: mv dist dist.old
       - name: Create go artifact
-        run: cd .repo && npx projen package:go
+        run: cd .repo/packages/@aws-cdk/cli-lib-alpha && npx projen package:go
       - name: Collect go artifact
-        run: mv .repo/dist dist
+        run: mv .repo/packages/@aws-cdk/cli-lib-alpha/dist dist
       - name: Release
         env:
           GIT_USER_NAME: github-actions
diff --git a/projenrc/jsii.ts b/projenrc/jsii.ts
index ff299c202..bcd80d9dc 100644
--- a/projenrc/jsii.ts
+++ b/projenrc/jsii.ts
@@ -504,11 +504,11 @@ export class JsiiBuild extends pj.Component {
       },
       {
         name: `Create ${target} artifact`,
-        run: `cd ${REPO_TEMP_DIRECTORY} && ${this.tsProject.runTaskCommand(packTask)}`,
+        run: `cd ${REPO_TEMP_DIRECTORY}/${this.monoProject.workspaceDirectory} && ${this.tsProject.runTaskCommand(packTask)}`,
       },
       {
         name: `Collect ${target} artifact`,
-        run: `mv ${REPO_TEMP_DIRECTORY}/${this.tsProject.artifactsDirectory} ${this.tsProject.artifactsDirectory}`,
+        run: `mv ${REPO_TEMP_DIRECTORY}/${this.monoProject.workspaceDirectory}/${this.tsProject.artifactsDirectory} ${this.tsProject.artifactsDirectory}`,
       },
     );
 

From c7fb216857eeeb430a3bcc89f9d08865e9e36ac0 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 19 Feb 2025 18:48:42 +0000
Subject: [PATCH 2/3] chore: self mutation

Signed-off-by: github-actions <github-actions@github.com>
---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4b6c219d6..6fc94dcdc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -447,7 +447,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_REPOSITORY: ${{ github.repository }}
           GITHUB_REF: ${{ github.sha }}
-        run: errout=$(mktemp); gh release create $(cat dist/releasetag.txt) -R $GITHUB_REPOSITORY -F dist/changelog.md -t $(cat dist/releasetag.txt) --target $GITHUB_REF 2> $errout && true; exitcode=$?; if [ $exitcode -ne 0 ] && ! grep -q "Release.tag_name already exists" $errout; then cat $errout; exit $exitcode; fi
+        run: errout=$(mktemp); gh release create $(cat dist/releasetag.txt) -R $GITHUB_REPOSITORY -F dist/changelog.md -t $(cat dist/releasetag.txt) --target $GITHUB_REF -p 2> $errout && true; exitcode=$?; if [ $exitcode -ne 0 ] && ! grep -q "Release.tag_name already exists" $errout; then cat $errout; exit $exitcode; fi
   cdk-assets_release_npm:
     name: "cdk-assets: Publish to npm"
     needs: release
@@ -469,7 +469,7 @@ jobs:
         continue-on-error: true
       - name: Release
         env:
-          NPM_DIST_TAG: latest
+          NPM_DIST_TAG: v3-latest
           NPM_REGISTRY: registry.npmjs.org
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: npx -p publib@latest publib-npm

From 6e581a978cdce688d55ee89ee57029eb7051f4a7 Mon Sep 17 00:00:00 2001
From: Rico Huijbers <rix0rrr@gmail.com>
Date: Wed, 19 Feb 2025 19:50:45 +0100
Subject: [PATCH 3/3] Yarn install

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4b6c219d6..6fc94dcdc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -447,7 +447,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_REPOSITORY: ${{ github.repository }}
           GITHUB_REF: ${{ github.sha }}
-        run: errout=$(mktemp); gh release create $(cat dist/releasetag.txt) -R $GITHUB_REPOSITORY -F dist/changelog.md -t $(cat dist/releasetag.txt) --target $GITHUB_REF 2> $errout && true; exitcode=$?; if [ $exitcode -ne 0 ] && ! grep -q "Release.tag_name already exists" $errout; then cat $errout; exit $exitcode; fi
+        run: errout=$(mktemp); gh release create $(cat dist/releasetag.txt) -R $GITHUB_REPOSITORY -F dist/changelog.md -t $(cat dist/releasetag.txt) --target $GITHUB_REF -p 2> $errout && true; exitcode=$?; if [ $exitcode -ne 0 ] && ! grep -q "Release.tag_name already exists" $errout; then cat $errout; exit $exitcode; fi
   cdk-assets_release_npm:
     name: "cdk-assets: Publish to npm"
     needs: release
@@ -469,7 +469,7 @@ jobs:
         continue-on-error: true
       - name: Release
         env:
-          NPM_DIST_TAG: latest
+          NPM_DIST_TAG: v3-latest
           NPM_REGISTRY: registry.npmjs.org
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: npx -p publib@latest publib-npm