From cf395841d65ba56328116efe11884e8badbfb509 Mon Sep 17 00:00:00 2001 From: Nara Kasbergen Kwon <855115+xiehan@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:32:26 +0200 Subject: [PATCH] chore(ci): fix syntax for concurrency in workflows (#436) BREAKING CHANGE: This increases the minimum required peer dependency version of Projen to v0.85. --------- Signed-off-by: team-tf-cdk Co-authored-by: team-tf-cdk --- .eslintrc.json | 2 +- .github/workflows/auto-approve.yml | 4 +- .github/workflows/automerge.yml | 4 +- .github/workflows/build.yml | 3 + .github/workflows/pull-request-lint.yml | 1 - .github/workflows/release.yml | 7 +- .github/workflows/upgrade-main.yml | 2 + .github/workflows/upgrade-node.yml | 3 +- .npmignore | 1 + .projen/deps.json | 2 +- .projen/tasks.json | 13 +- .projenrc.ts | 7 +- API.md | 49 ++++- package.json | 11 +- projenrc/upgrade-node.ts | 4 +- src/auto-approve.ts | 6 +- src/automerge.ts | 6 +- test/__snapshots__/index.test.ts.snap | 254 ++++++++++++++++-------- yarn.lock | 10 +- 19 files changed, 279 insertions(+), 110 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index b017cf4f..afcba934 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -76,7 +76,7 @@ } } ], - "no-duplicate-imports": [ + "import/no-duplicates": [ "error" ], "no-shadow": [ diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index f696b8a1..7c99f518 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -8,7 +8,9 @@ on: - labeled - ready_for_review - reopened -concurrency: ${{ github.workflow }}-${{ github.head_ref }} +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref }} + cancel-in-progress: true jobs: approve: runs-on: ubuntu-latest diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index fb390129..14c1d679 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -9,7 +9,9 @@ on: - ready_for_review - reopened - synchronize -concurrency: ${{ github.workflow }}-${{ github.head_ref }} +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref }} + cancel-in-progress: true jobs: automerge: runs-on: ubuntu-latest diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b52683a6..11b781a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,12 +36,14 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.self_mutation.outputs.self_mutation_happened uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 with: name: .repo.patch path: .repo.patch + overwrite: true - name: Fail build on mutation if: steps.self_mutation.outputs.self_mutation_happened run: |- @@ -56,6 +58,7 @@ jobs: with: name: build-artifact path: dist + overwrite: true self-mutation: needs: build runs-on: ubuntu-latest diff --git a/.github/workflows/pull-request-lint.yml b/.github/workflows/pull-request-lint.yml index f7e6d3f8..af9b7a7b 100644 --- a/.github/workflows/pull-request-lint.yml +++ b/.github/workflows/pull-request-lint.yml @@ -26,4 +26,3 @@ jobs: fix chore requireScope: false - githubBaseUrl: ${{ github.api_url }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8760b142..317353f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,9 +59,12 @@ jobs: with: name: build-artifact path: dist + overwrite: true release_github: name: Publish to GitHub Releases - needs: release + needs: + - release + - release_npm runs-on: ubuntu-latest permissions: contents: write @@ -86,7 +89,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_REPOSITORY: ${{ github.repository }} - GITHUB_REF: ${{ github.ref }} + 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 release_npm: name: Publish to npm diff --git a/.github/workflows/upgrade-main.yml b/.github/workflows/upgrade-main.yml index 96c3a6a6..ce75835b 100644 --- a/.github/workflows/upgrade-main.yml +++ b/.github/workflows/upgrade-main.yml @@ -31,12 +31,14 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.create_patch.outputs.patch_created uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 with: name: .repo.patch path: .repo.patch + overwrite: true pr: name: Create Pull Request needs: upgrade diff --git a/.github/workflows/upgrade-node.yml b/.github/workflows/upgrade-node.yml index f87fe151..f334b8c4 100644 --- a/.github/workflows/upgrade-node.yml +++ b/.github/workflows/upgrade-node.yml @@ -5,7 +5,8 @@ on: schedule: - cron: 52 4 * * * workflow_dispatch: {} -concurrency: ${{ github.workflow }}-${{ github.ref }} +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} jobs: upgrade: name: Upgrade Node.js diff --git a/.npmignore b/.npmignore index cbb74d69..19402adf 100644 --- a/.npmignore +++ b/.npmignore @@ -27,3 +27,4 @@ projenrc .copywrite.hcl /.gitattributes /.projenrc.ts +/projenrc diff --git a/.projen/deps.json b/.projen/deps.json index 2b37a0ae..a7e7f6fa 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -129,7 +129,7 @@ }, { "name": "projen", - "version": "^0.79.3", + "version": "^0.85.0", "type": "peer" }, { diff --git a/.projen/tasks.json b/.projen/tasks.json index 19d4af4e..29e059df 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -162,7 +162,12 @@ "description": "Creates the distribution package", "steps": [ { - "exec": "if [ ! -z ${CI} ]; then rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist; else npx projen package-all; fi" + "exec": "rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist", + "condition": "node -e \"if (!process.env.CI) process.exit(1)\"" + }, + { + "spawn": "package-all", + "condition": "node -e \"if (process.env.CI) process.exit(1)\"" } ] }, @@ -230,7 +235,7 @@ "description": "Run tests", "steps": [ { - "exec": "jest --passWithNoTests --coverageProvider=v8 --updateSnapshot", + "exec": "jest --passWithNoTests --updateSnapshot", "receiveArgs": true }, { @@ -271,13 +276,13 @@ }, "steps": [ { - "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@types/fs-extra,@types/glob,@types/jest,@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-config-prettier,eslint-import-resolver-typescript,eslint-plugin-import,eslint-plugin-prettier,eslint,glob,jest,jest-junit,jsii-diff,jsii-docgen,jsii-pacmak,prettier,projen,standard-version,ts-jest,ts-node,change-case,fs-extra" + "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@types/fs-extra,@types/glob,@types/jest,eslint-config-prettier,eslint-import-resolver-typescript,eslint-plugin-import,eslint-plugin-prettier,glob,jest,jsii-diff,jsii-docgen,jsii-pacmak,prettier,projen,ts-jest,ts-node,change-case,fs-extra" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade @types/fs-extra @types/glob @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-config-prettier eslint-import-resolver-typescript eslint-plugin-import eslint-plugin-prettier eslint glob jest jest-junit jsii-diff jsii-docgen jsii-pacmak prettier projen standard-version ts-jest ts-node change-case fs-extra" + "exec": "yarn upgrade @types/fs-extra @types/glob @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-config-prettier eslint-import-resolver-typescript eslint-plugin-import eslint-plugin-prettier eslint glob jest jest-junit jsii-diff jsii-docgen jsii-pacmak jsii-rosetta jsii prettier projen standard-version ts-jest ts-node typescript change-case fs-extra" }, { "exec": "npx projen" diff --git a/.projenrc.ts b/.projenrc.ts index de046e50..9d6dc67d 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -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.79.3", "constructs@^10.3.0"], + peerDeps: ["projen@^0.85.0", "constructs@^10.3.0"], deps: ["change-case", "fs-extra"], devDeps: ["@types/fs-extra", "glob", "@types/glob"], bundledDeps: ["change-case", "fs-extra"], @@ -89,6 +89,11 @@ const project = new cdk.JsiiProject({ projenrcTs: true, }); +// @typescript-eslint v7+ requires Node.js 18.18, so we are stuck on v6 +// The below lines can probably be removed once Node 18 goes EOL and we upgrade minNodeVersion to 20 +project.addDevDeps("@typescript-eslint/eslint-plugin@^6"); +project.addDevDeps("@typescript-eslint/parser@^6"); + project.addFields({ publishConfig: { access: "public" } }); new CustomizedLicense(project, 2020); diff --git a/API.md b/API.md index ee01a495..66c2db98 100644 --- a/API.md +++ b/API.md @@ -1570,6 +1570,7 @@ const cdktfProviderProjectOptions: CdktfProviderProjectOptions = { ... } | maxNodeVersion | string | Minimum node.js version to require via `engines` (inclusive). | | minNodeVersion | string | Minimum Node.js version to require via package.json `engines` (inclusive). | | npmAccess | projen.javascript.NpmAccess | Access level of the npm package. | +| npmProvenance | boolean | Should provenance statements be generated when the package is published. | | npmRegistry | string | The host name of the npm registry to publish to. | | npmRegistryUrl | string | The base URL of the npm package registry. | | npmTokenSecret | string | GitHub secret which contains the NPM token to use when publishing packages. | @@ -1610,10 +1611,11 @@ const cdktfProviderProjectOptions: CdktfProviderProjectOptions = { ... } | artifactsDirectory | string | A directory which will contain build artifacts. | | autoApproveUpgrades | boolean | Automatically approve deps upgrade PRs, allowing them to be merged by mergify (if configued). | | buildWorkflow | boolean | Define a GitHub workflow for building PRs. | +| buildWorkflowOptions | projen.javascript.BuildWorkflowOptions | Options for PR build workflow. | | buildWorkflowTriggers | projen.github.workflows.Triggers | Build workflow triggers. | | bundlerOptions | projen.javascript.BundlerOptions | Options for `Bundler`. | | checkLicenses | projen.javascript.LicenseCheckerOptions | Configure which licenses should be deemed acceptable for use by dependencies. | -| codeCov | boolean | Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v3 A secret is required for private repos. Configured with `@codeCovTokenSecret`. | +| codeCov | boolean | Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v4 A secret is required for private repos. Configured with `@codeCovTokenSecret`. | | codeCovTokenSecret | string | Define the secret name for a specified https://codecov.io/ token A secret is required to send coverage for private repositories. | | copyrightOwner | string | License copyright owner. | | copyrightPeriod | string | The copyright years to put in the LICENSE file. | @@ -2445,6 +2447,27 @@ Access level of the npm package. --- +##### `npmProvenance`Optional + +```typescript +public readonly npmProvenance: boolean; +``` + +- *Type:* boolean +- *Default:* true for public packages, false otherwise + +Should provenance statements be generated when the package is published. + +A supported package manager is required to publish a package with npm provenance statements and +you will need to use a supported CI/CD provider. + +Note that the projen `Release` and `Publisher` components are using `publib` to publish packages, +which is using npm internally and supports provenance statements independently of the package manager used. + +> [https://docs.npmjs.com/generating-provenance-statements](https://docs.npmjs.com/generating-provenance-statements) + +--- + ##### ~~`npmRegistry`~~Optional - *Deprecated:* use `npmRegistryUrl` instead @@ -3022,7 +3045,21 @@ Define a GitHub workflow for building PRs. --- -##### `buildWorkflowTriggers`Optional +##### `buildWorkflowOptions`Optional + +```typescript +public readonly buildWorkflowOptions: BuildWorkflowOptions; +``` + +- *Type:* projen.javascript.BuildWorkflowOptions + +Options for PR build workflow. + +--- + +##### ~~`buildWorkflowTriggers`~~Optional + +- *Deprecated:* - Use `buildWorkflowOptions.workflowTriggers` ```typescript public readonly buildWorkflowTriggers: Triggers; @@ -3071,7 +3108,7 @@ public readonly codeCov: boolean; - *Type:* boolean - *Default:* false -Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v3 A secret is required for private repos. Configured with `@codeCovTokenSecret`. +Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v4 A secret is required for private repos. Configured with `@codeCovTokenSecret`. --- @@ -3208,7 +3245,9 @@ Jest options. --- -##### `mutableBuild`Optional +##### ~~`mutableBuild`~~Optional + +- *Deprecated:* - Use `buildWorkflowOptions.mutableBuild` ```typescript public readonly mutableBuild: boolean; @@ -3312,7 +3351,7 @@ public readonly projenDevDependency: boolean; ``` - *Type:* boolean -- *Default:* true +- *Default:* true if not a subproject Indicates of "projen" should be installed as a devDependency. diff --git a/package.json b/package.json index c2a48a53..8ee657a6 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "jsii-pacmak": "^1.102.0", "jsii-rosetta": "~5.3.0", "prettier": "^2.8.8", - "projen": "0.79.3", + "projen": "0.85.0", "standard-version": "^9", "ts-jest": "^29", "ts-node": "^10.9.2", @@ -64,7 +64,7 @@ }, "peerDependencies": { "constructs": "^10.3.0", - "projen": "^0.79.3" + "projen": "^0.85.0" }, "dependencies": { "change-case": "^4.1.2", @@ -84,9 +84,12 @@ }, "version": "0.0.0", "jest": { + "coverageProvider": "v8", "testMatch": [ - "/src/**/__tests__/**/*.ts?(x)", - "/(test|src)/**/*(*.)@(spec|test).ts?(x)" + "/@(src|test)/**/*(*.)@(spec|test).ts?(x)", + "/@(src|test)/**/__tests__/**/*.ts?(x)", + "/@(projenrc)/**/*(*.)@(spec|test).ts?(x)", + "/@(projenrc)/**/__tests__/**/*.ts?(x)" ], "clearMocks": true, "collectCoverage": true, diff --git a/projenrc/upgrade-node.ts b/projenrc/upgrade-node.ts index c044b1b2..8604378f 100644 --- a/projenrc/upgrade-node.ts +++ b/projenrc/upgrade-node.ts @@ -25,7 +25,9 @@ export class UpgradeNode { workflowDispatch: {}, // allow manual triggering }); - (workflow.concurrency as any) = "${{ github.workflow }}-${{ github.ref }}"; + (workflow.concurrency as any) = { + group: "${{ github.workflow }}-${{ github.ref }}", + }; workflow.addJobs({ upgrade: { diff --git a/src/auto-approve.ts b/src/auto-approve.ts index fb713594..8a3ef1ac 100644 --- a/src/auto-approve.ts +++ b/src/auto-approve.ts @@ -21,8 +21,10 @@ export class AutoApprove { }, }); - (workflow.concurrency as any) = - "${{ github.workflow }}-${{ github.head_ref }}"; + (workflow.concurrency as any) = { + group: "${{ github.workflow }}-${{ github.head_ref }}", + cancelInProgress: true, + }; const maintainerStatuses = `fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]')`; workflow.addJobs({ diff --git a/src/automerge.ts b/src/automerge.ts index bc27e549..64ab58b4 100644 --- a/src/automerge.ts +++ b/src/automerge.ts @@ -27,8 +27,10 @@ export class Automerge { }, }); - (workflow.concurrency as any) = - "${{ github.workflow }}-${{ github.head_ref }}"; + (workflow.concurrency as any) = { + group: "${{ github.workflow }}-${{ github.head_ref }}", + cancelInProgress: true, + }; const maintainerStatuses = `fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]')`; workflow.addJobs({ diff --git a/test/__snapshots__/index.test.ts.snap b/test/__snapshots__/index.test.ts.snap index b5fbf798..10439656 100644 --- a/test/__snapshots__/index.test.ts.snap +++ b/test/__snapshots__/index.test.ts.snap @@ -76,7 +76,9 @@ on: - labeled - ready_for_review - reopened -concurrency: \${{ github.workflow }}-\${{ github.head_ref }} +concurrency: + group: \${{ github.workflow }}-\${{ github.head_ref }} + cancel-in-progress: true jobs: approve: runs-on: ubuntu-latest @@ -164,7 +166,9 @@ on: - ready_for_review - reopened - synchronize -concurrency: \${{ github.workflow }}-\${{ github.head_ref }} +concurrency: + group: \${{ github.workflow }}-\${{ github.head_ref }} + cancel-in-progress: true jobs: automerge: runs-on: ubuntu-latest @@ -219,12 +223,14 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.self_mutation.outputs.self_mutation_happened uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 with: name: .repo.patch path: .repo.patch + overwrite: true - name: Fail build on mutation if: steps.self_mutation.outputs.self_mutation_happened run: |- @@ -239,6 +245,7 @@ jobs: with: name: build-artifact path: dist + overwrite: true self-mutation: needs: build runs-on: ubuntu-latest @@ -303,8 +310,8 @@ jobs: steps: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: - distribution: temurin - java-version: 11.x + distribution: corretto + java-version: "11" - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: node-version: 18.x @@ -363,7 +370,7 @@ jobs: node-version: 18.x - uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee with: - dotnet-version: 3.x + dotnet-version: 6.x - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -391,7 +398,7 @@ jobs: node-version: 18.x - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: ^1.16.0 + go-version: ^1.18.0 - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -458,7 +465,6 @@ jobs: fix chore requireScope: false - githubBaseUrl: \${{ github.api_url }} ", ".github/workflows/release.yml": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". @@ -515,6 +521,7 @@ jobs: with: name: build-artifact path: dist + overwrite: true deprecate: name: Deprecate the package in package managers if needed needs: @@ -544,7 +551,13 @@ jobs: npm deprecate @cdktf/provider-random "See https://cdk.tf/imports for details on how to continue to use the random provider in your CDK for Terraform (CDKTF) projects by generating the bindings locally." release_github: name: Publish to GitHub Releases - needs: release + needs: + - release + - release_npm + - release_maven + - release_pypi + - release_nuget + - release_golang runs-on: ubuntu-latest permissions: contents: write @@ -570,7 +583,7 @@ jobs: env: GITHUB_TOKEN: \${{ secrets.GITHUB_TOKEN }} GITHUB_REPOSITORY: \${{ github.repository }} - GITHUB_REF: \${{ github.ref }} + 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 - name: Extract Version id: extract-version @@ -643,8 +656,8 @@ jobs: steps: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: - distribution: temurin - java-version: 11.x + distribution: corretto + java-version: "11" - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: node-version: 18.x @@ -750,7 +763,7 @@ jobs: node-version: 18.x - uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee with: - dotnet-version: 3.x + dotnet-version: 6.x - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -798,7 +811,7 @@ jobs: node-version: 18.x - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: ^1.16.0 + go-version: ^1.18.0 - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -1256,7 +1269,12 @@ scripts "description": "Creates the distribution package", "steps": [ { - "exec": "if [ ! -z \${CI} ]; then rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist; else npx projen package-all; fi" + "exec": "rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist", + "condition": "node -e \\"if (!process.env.CI) process.exit(1)\\"" + }, + { + "spawn": "package-all", + "condition": "node -e \\"if (process.env.CI) process.exit(1)\\"" } ] }, @@ -2189,7 +2207,9 @@ on: - labeled - ready_for_review - reopened -concurrency: \${{ github.workflow }}-\${{ github.head_ref }} +concurrency: + group: \${{ github.workflow }}-\${{ github.head_ref }} + cancel-in-progress: true jobs: approve: runs-on: ubuntu-latest @@ -2277,7 +2297,9 @@ on: - ready_for_review - reopened - synchronize -concurrency: \${{ github.workflow }}-\${{ github.head_ref }} +concurrency: + group: \${{ github.workflow }}-\${{ github.head_ref }} + cancel-in-progress: true jobs: automerge: runs-on: ubuntu-latest @@ -2332,12 +2354,14 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.self_mutation.outputs.self_mutation_happened uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 with: name: .repo.patch path: .repo.patch + overwrite: true - name: Fail build on mutation if: steps.self_mutation.outputs.self_mutation_happened run: |- @@ -2352,6 +2376,7 @@ jobs: with: name: build-artifact path: dist + overwrite: true self-mutation: needs: build runs-on: ubuntu-latest @@ -2416,8 +2441,8 @@ jobs: steps: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: - distribution: temurin - java-version: 11.x + distribution: corretto + java-version: "11" - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: node-version: 18.x @@ -2476,7 +2501,7 @@ jobs: node-version: 18.x - uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee with: - dotnet-version: 3.x + dotnet-version: 6.x - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -2504,7 +2529,7 @@ jobs: node-version: 18.x - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: ^1.16.0 + go-version: ^1.18.0 - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -2747,7 +2772,6 @@ jobs: fix chore requireScope: false - githubBaseUrl: \${{ github.api_url }} ", ".github/workflows/release.yml": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". @@ -2802,6 +2826,7 @@ jobs: with: name: build-artifact path: dist + overwrite: true deprecate: name: Deprecate the package in package managers if needed needs: @@ -2831,7 +2856,13 @@ jobs: npm deprecate @cdktf/provider-random "See https://cdk.tf/imports for details on how to continue to use the random provider in your CDK for Terraform (CDKTF) projects by generating the bindings locally." release_github: name: Publish to GitHub Releases - needs: release + needs: + - release + - release_npm + - release_maven + - release_pypi + - release_nuget + - release_golang runs-on: ubuntu-latest permissions: contents: write @@ -2857,7 +2888,7 @@ jobs: env: GITHUB_TOKEN: \${{ secrets.GITHUB_TOKEN }} GITHUB_REPOSITORY: \${{ github.repository }} - GITHUB_REF: \${{ github.ref }} + 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 - name: Extract Version id: extract-version @@ -2930,8 +2961,8 @@ jobs: steps: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: - distribution: temurin - java-version: 11.x + distribution: corretto + java-version: "11" - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: node-version: 18.x @@ -3037,7 +3068,7 @@ jobs: node-version: 18.x - uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee with: - dotnet-version: 3.x + dotnet-version: 6.x - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -3085,7 +3116,7 @@ jobs: node-version: 18.x - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: ^1.16.0 + go-version: ^1.18.0 - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -3202,12 +3233,14 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.create_patch.outputs.patch_created uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 with: name: .repo.patch path: .repo.patch + overwrite: true pr: name: Create Pull Request needs: upgrade @@ -3660,7 +3693,12 @@ scripts "description": "Creates the distribution package", "steps": [ { - "exec": "if [ ! -z \${CI} ]; then rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist; else npx projen package-all; fi" + "exec": "rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist", + "condition": "node -e \\"if (!process.env.CI) process.exit(1)\\"" + }, + { + "spawn": "package-all", + "condition": "node -e \\"if (process.env.CI) process.exit(1)\\"" } ] }, @@ -3827,13 +3865,13 @@ scripts }, "steps": [ { - "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@actions/core,@cdktf/provider-project,@types/node,dot-prop,jsii-diff,jsii-docgen,jsii-pacmak,projen,semver,standard-version" + "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=jsii-diff,jsii-pacmak,projen" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade @actions/core @cdktf/provider-project @types/node dot-prop jsii-diff jsii-docgen jsii-pacmak projen semver standard-version" + "exec": "yarn upgrade @actions/core @cdktf/provider-project @types/node cdktf-cli cdktf constructs dot-prop jsii-diff jsii-docgen jsii-pacmak jsii-rosetta jsii projen semver standard-version typescript" }, { "exec": "npx projen" @@ -4897,7 +4935,9 @@ on: - labeled - ready_for_review - reopened -concurrency: \${{ github.workflow }}-\${{ github.head_ref }} +concurrency: + group: \${{ github.workflow }}-\${{ github.head_ref }} + cancel-in-progress: true jobs: approve: runs-on: ubuntu-latest @@ -4985,7 +5025,9 @@ on: - ready_for_review - reopened - synchronize -concurrency: \${{ github.workflow }}-\${{ github.head_ref }} +concurrency: + group: \${{ github.workflow }}-\${{ github.head_ref }} + cancel-in-progress: true jobs: automerge: runs-on: ubuntu-latest @@ -5040,12 +5082,14 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.self_mutation.outputs.self_mutation_happened uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 with: name: .repo.patch path: .repo.patch + overwrite: true - name: Fail build on mutation if: steps.self_mutation.outputs.self_mutation_happened run: |- @@ -5060,6 +5104,7 @@ jobs: with: name: build-artifact path: dist + overwrite: true self-mutation: needs: build runs-on: custom-linux-medium @@ -5124,8 +5169,8 @@ jobs: steps: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: - distribution: temurin - java-version: 11.x + distribution: corretto + java-version: "11" - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: node-version: 18.x @@ -5184,7 +5229,7 @@ jobs: node-version: 18.x - uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee with: - dotnet-version: 3.x + dotnet-version: 6.x - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -5212,7 +5257,7 @@ jobs: node-version: 18.x - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: ^1.16.0 + go-version: ^1.18.0 - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -5455,7 +5500,6 @@ jobs: fix chore requireScope: false - githubBaseUrl: \${{ github.api_url }} ", ".github/workflows/release.yml": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". @@ -5510,6 +5554,7 @@ jobs: with: name: build-artifact path: dist + overwrite: true deprecate: name: Deprecate the package in package managers if needed needs: @@ -5539,7 +5584,13 @@ jobs: npm deprecate @cdktf/provider-random "See https://cdk.tf/imports for details on how to continue to use the random provider in your CDK for Terraform (CDKTF) projects by generating the bindings locally." release_github: name: Publish to GitHub Releases - needs: release + needs: + - release + - release_npm + - release_maven + - release_pypi + - release_nuget + - release_golang runs-on: custom-linux-medium permissions: contents: write @@ -5565,7 +5616,7 @@ jobs: env: GITHUB_TOKEN: \${{ secrets.GITHUB_TOKEN }} GITHUB_REPOSITORY: \${{ github.repository }} - GITHUB_REF: \${{ github.ref }} + 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 - name: Extract Version id: extract-version @@ -5638,8 +5689,8 @@ jobs: steps: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: - distribution: temurin - java-version: 11.x + distribution: corretto + java-version: "11" - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: node-version: 18.x @@ -5745,7 +5796,7 @@ jobs: node-version: 18.x - uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee with: - dotnet-version: 3.x + dotnet-version: 6.x - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -5793,7 +5844,7 @@ jobs: node-version: 18.x - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: ^1.16.0 + go-version: ^1.18.0 - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -5910,12 +5961,14 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.create_patch.outputs.patch_created uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 with: name: .repo.patch path: .repo.patch + overwrite: true pr: name: Create Pull Request needs: upgrade @@ -6368,7 +6421,12 @@ scripts "description": "Creates the distribution package", "steps": [ { - "exec": "if [ ! -z \${CI} ]; then rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist; else npx projen package-all; fi" + "exec": "rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist", + "condition": "node -e \\"if (!process.env.CI) process.exit(1)\\"" + }, + { + "spawn": "package-all", + "condition": "node -e \\"if (process.env.CI) process.exit(1)\\"" } ] }, @@ -6535,13 +6593,13 @@ scripts }, "steps": [ { - "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@actions/core,@cdktf/provider-project,@types/node,dot-prop,jsii-diff,jsii-docgen,jsii-pacmak,projen,semver,standard-version" + "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=jsii-diff,jsii-pacmak,projen" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade @actions/core @cdktf/provider-project @types/node dot-prop jsii-diff jsii-docgen jsii-pacmak projen semver standard-version" + "exec": "yarn upgrade @actions/core @cdktf/provider-project @types/node cdktf-cli cdktf constructs dot-prop jsii-diff jsii-docgen jsii-pacmak jsii-rosetta jsii projen semver standard-version typescript" }, { "exec": "npx projen" @@ -7605,7 +7663,9 @@ on: - labeled - ready_for_review - reopened -concurrency: \${{ github.workflow }}-\${{ github.head_ref }} +concurrency: + group: \${{ github.workflow }}-\${{ github.head_ref }} + cancel-in-progress: true jobs: approve: runs-on: ubuntu-latest @@ -7693,7 +7753,9 @@ on: - ready_for_review - reopened - synchronize -concurrency: \${{ github.workflow }}-\${{ github.head_ref }} +concurrency: + group: \${{ github.workflow }}-\${{ github.head_ref }} + cancel-in-progress: true jobs: automerge: runs-on: ubuntu-latest @@ -7748,12 +7810,14 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.self_mutation.outputs.self_mutation_happened uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 with: name: .repo.patch path: .repo.patch + overwrite: true - name: Fail build on mutation if: steps.self_mutation.outputs.self_mutation_happened run: |- @@ -7768,6 +7832,7 @@ jobs: with: name: build-artifact path: dist + overwrite: true self-mutation: needs: build runs-on: ubuntu-latest @@ -7832,8 +7897,8 @@ jobs: steps: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: - distribution: temurin - java-version: 11.x + distribution: corretto + java-version: "11" - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: node-version: 18.x @@ -7892,7 +7957,7 @@ jobs: node-version: 18.x - uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee with: - dotnet-version: 3.x + dotnet-version: 6.x - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -7920,7 +7985,7 @@ jobs: node-version: 18.x - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: ^1.16.0 + go-version: ^1.18.0 - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -8163,7 +8228,6 @@ jobs: fix chore requireScope: false - githubBaseUrl: \${{ github.api_url }} ", ".github/workflows/release.yml": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". @@ -8218,6 +8282,7 @@ jobs: with: name: build-artifact path: dist + overwrite: true deprecate: name: Deprecate the package in package managers if needed needs: @@ -8247,7 +8312,13 @@ jobs: npm deprecate @cdktf/provider-random "See https://cdk.tf/imports for details on how to continue to use the random provider in your CDK for Terraform (CDKTF) projects by generating the bindings locally." release_github: name: Publish to GitHub Releases - needs: release + needs: + - release + - release_npm + - release_maven + - release_pypi + - release_nuget + - release_golang runs-on: ubuntu-latest permissions: contents: write @@ -8273,7 +8344,7 @@ jobs: env: GITHUB_TOKEN: \${{ secrets.GITHUB_TOKEN }} GITHUB_REPOSITORY: \${{ github.repository }} - GITHUB_REF: \${{ github.ref }} + 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 - name: Extract Version id: extract-version @@ -8346,8 +8417,8 @@ jobs: steps: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: - distribution: temurin - java-version: 11.x + distribution: corretto + java-version: "11" - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: node-version: 18.x @@ -8453,7 +8524,7 @@ jobs: node-version: 18.x - uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee with: - dotnet-version: 3.x + dotnet-version: 6.x - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -8501,7 +8572,7 @@ jobs: node-version: 18.x - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: ^1.16.0 + go-version: ^1.18.0 - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -8618,12 +8689,14 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.create_patch.outputs.patch_created uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 with: name: .repo.patch path: .repo.patch + overwrite: true pr: name: Create Pull Request needs: upgrade @@ -9076,7 +9149,12 @@ scripts "description": "Creates the distribution package", "steps": [ { - "exec": "if [ ! -z \${CI} ]; then rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist; else npx projen package-all; fi" + "exec": "rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist", + "condition": "node -e \\"if (!process.env.CI) process.exit(1)\\"" + }, + { + "spawn": "package-all", + "condition": "node -e \\"if (process.env.CI) process.exit(1)\\"" } ] }, @@ -9243,13 +9321,13 @@ scripts }, "steps": [ { - "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@actions/core,@cdktf/provider-project,@types/node,dot-prop,jsii-diff,jsii-docgen,jsii-pacmak,projen,semver,standard-version" + "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=jsii-diff,jsii-pacmak,projen" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade @actions/core @cdktf/provider-project @types/node dot-prop jsii-diff jsii-docgen jsii-pacmak projen semver standard-version" + "exec": "yarn upgrade @actions/core @cdktf/provider-project @types/node cdktf-cli cdktf constructs dot-prop jsii-diff jsii-docgen jsii-pacmak jsii-rosetta jsii projen semver standard-version typescript" }, { "exec": "npx projen" @@ -10313,7 +10391,9 @@ on: - labeled - ready_for_review - reopened -concurrency: \${{ github.workflow }}-\${{ github.head_ref }} +concurrency: + group: \${{ github.workflow }}-\${{ github.head_ref }} + cancel-in-progress: true jobs: approve: runs-on: ubuntu-latest @@ -10401,7 +10481,9 @@ on: - ready_for_review - reopened - synchronize -concurrency: \${{ github.workflow }}-\${{ github.head_ref }} +concurrency: + group: \${{ github.workflow }}-\${{ github.head_ref }} + cancel-in-progress: true jobs: automerge: runs-on: ubuntu-latest @@ -10460,12 +10542,14 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.self_mutation.outputs.self_mutation_happened uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 with: name: .repo.patch path: .repo.patch + overwrite: true - name: Fail build on mutation if: steps.self_mutation.outputs.self_mutation_happened run: |- @@ -10480,6 +10564,7 @@ jobs: with: name: build-artifact path: dist + overwrite: true self-mutation: needs: build runs-on: ubuntu-latest @@ -10544,8 +10629,8 @@ jobs: steps: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: - distribution: temurin - java-version: 11.x + distribution: corretto + java-version: "11" - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: node-version: 18.12.0 @@ -10604,7 +10689,7 @@ jobs: node-version: 18.12.0 - uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee with: - dotnet-version: 3.x + dotnet-version: 6.x - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -10632,7 +10717,7 @@ jobs: node-version: 18.12.0 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: ^1.16.0 + go-version: ^1.18.0 - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -10877,7 +10962,6 @@ jobs: fix chore requireScope: false - githubBaseUrl: \${{ github.api_url }} ", ".github/workflows/release.yml": "# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". @@ -10936,6 +11020,7 @@ jobs: with: name: build-artifact path: dist + overwrite: true deprecate: name: Deprecate the package in package managers if needed needs: @@ -10965,7 +11050,13 @@ jobs: npm deprecate @cdktf/provider-acme "See https://cdk.tf/imports for details on how to continue to use the acme provider in your CDK for Terraform (CDKTF) projects by generating the bindings locally." release_github: name: Publish to GitHub Releases - needs: release + needs: + - release + - release_npm + - release_maven + - release_pypi + - release_nuget + - release_golang runs-on: ubuntu-latest permissions: contents: write @@ -10991,7 +11082,7 @@ jobs: env: GITHUB_TOKEN: \${{ secrets.GITHUB_TOKEN }} GITHUB_REPOSITORY: \${{ github.repository }} - GITHUB_REF: \${{ github.ref }} + 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 - name: Extract Version id: extract-version @@ -11064,8 +11155,8 @@ jobs: steps: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: - distribution: temurin - java-version: 11.x + distribution: corretto + java-version: "11" - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: node-version: 18.12.0 @@ -11171,7 +11262,7 @@ jobs: node-version: 18.12.0 - uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee with: - dotnet-version: 3.x + dotnet-version: 6.x - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -11219,7 +11310,7 @@ jobs: node-version: 18.12.0 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: ^1.16.0 + go-version: ^1.18.0 - name: Download build artifacts uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: @@ -11340,12 +11431,14 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.create_patch.outputs.patch_created uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 with: name: .repo.patch path: .repo.patch + overwrite: true pr: name: Create Pull Request needs: upgrade @@ -11798,7 +11891,12 @@ scripts "description": "Creates the distribution package", "steps": [ { - "exec": "if [ ! -z \${CI} ]; then rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist; else npx projen package-all; fi" + "exec": "rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist", + "condition": "node -e \\"if (!process.env.CI) process.exit(1)\\"" + }, + { + "spawn": "package-all", + "condition": "node -e \\"if (process.env.CI) process.exit(1)\\"" } ] }, @@ -11965,13 +12063,13 @@ scripts }, "steps": [ { - "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@actions/core,@cdktf/provider-project,@types/node,cdktf-cli,cdktf,constructs,dot-prop,jsii-diff,jsii-docgen,jsii-pacmak,projen,semver,standard-version" + "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=jsii-diff,jsii-pacmak,projen" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade @actions/core @cdktf/provider-project @types/node cdktf-cli cdktf constructs dot-prop jsii-diff jsii-docgen jsii-pacmak projen semver standard-version" + "exec": "yarn upgrade @actions/core @cdktf/provider-project @types/node cdktf-cli cdktf constructs dot-prop jsii-diff jsii-docgen jsii-pacmak jsii-rosetta jsii projen semver standard-version typescript" }, { "exec": "npx projen" diff --git a/yarn.lock b/yarn.lock index aae6f26c..afb15124 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4169,10 +4169,10 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -projen@0.79.3: - version "0.79.3" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.79.3.tgz#385761af74b8df15f58eef21022eb7d3645b2690" - integrity sha512-nmYW1YXFNdZNNDlfHsT4sMfE5vMgMbpG061RT+gtuvGkhm+6nYd8+kWo6xk+2J/egoNvXyS5kEbh4fFc41I5hA== +projen@0.85.0: + version "0.85.0" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.85.0.tgz#ce182db7e37a7784172a49d037693ce2a272d561" + integrity sha512-5W4+h/f5eDENFVeOdAGnuZQD88BSCNy7gxYUge9L87qlbvOR3cKF9fzEguFryGcBJKN6AtCjACsdMwHyNE4xPQ== dependencies: "@iarna/toml" "^2.2.5" case "^1.6.3" @@ -4183,7 +4183,7 @@ projen@0.79.3: fast-json-patch "^3.1.1" glob "^8" ini "^2.0.0" - semver "^7.5.4" + semver "^7.6.3" shx "^0.3.4" xmlbuilder2 "^3.1.1" yaml "^2.2.2"