Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update projen to 0.87.4 #447

Merged
merged 2 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 20 additions & 11 deletions .github/workflows/build.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 13 additions & 8 deletions .github/workflows/release.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions .github/workflows/upgrade-main.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions .projen/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions .projen/tasks.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const project = new cdk.JsiiProject({
pullRequestTemplate: false,
jsiiVersion: "~5.3.0",
typescriptVersion: "~5.3.0", // should always be the same major/minor as JSII
peerDeps: ["projen@^0.85.0", "constructs@^10.3.0"],
peerDeps: ["projen@^0.87.4", "constructs@^10.3.0"],
deps: ["change-case", "fs-extra"],
bundledDeps: ["change-case", "fs-extra"],
defaultReleaseBranch: "main",
Expand Down
4 changes: 2 additions & 2 deletions API.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -358,10 +358,10 @@ export class CdktfProviderProject extends cdk.JsiiProject {
const oldExistingTagRun: string = checkExistingTagStep.run;
prettyAssertEqual(
oldExistingTagRun.split("\n")[0],
"TAG=$(cat dist/dist/releasetag.txt)",
"TAG=$(cat dist/releasetag.txt)",
"release step changed, please check if the workaround still works!"
);
checkExistingTagStep.run = `if [ ! -f dist/dist/releasetag.txt ]; then (echo "exists=true" >> $GITHUB_OUTPUT) && exit 0; fi\n${oldExistingTagRun}`;
checkExistingTagStep.run = `if [ ! -f dist/releasetag.txt ]; then (echo "exists=true" >> $GITHUB_OUTPUT) && exit 0; fi\n${oldExistingTagRun}`;

if (!isDeprecated) {
const { upgrade, pr } = (this.upgradeWorkflow as any).workflows[0].jobs;
Expand All @@ -372,7 +372,7 @@ export class CdktfProviderProject extends cdk.JsiiProject {
// Fix maven issue (https://github.com/cdklabs/publib/pull/777)
github.GitHub.of(this)?.tryFindWorkflow("release")?.file?.patch(
JsonPatch.add(
"/jobs/release_maven/steps/8/env/MAVEN_OPTS",
"/jobs/release_maven/steps/10/env/MAVEN_OPTS",
// See https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco
"--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED"
)
Expand Down
Loading