Skip to content

Commit

Permalink
Merge branch 'main' into automation/yarn-upgrade-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielMSchmidt committed Feb 26, 2024
2 parents 305fb89 + 5e67db1 commit c0a8fbf
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cdktf-provider-docs-rollout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
providerFqn: ${{ matrix.provider.fqn }}
languages: "typescript,python"
parallelFileConversions: 1
maxRunners: 20
maxRunners: 1
cdktfRegistryDocsVersion: "1.21.0"

reportFailureToSlack:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/registry-docs-pr-based.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ jobs:
git checkout -b d-cdktf-docs-${{ github.run_id }}-${{ github.run_number }}
git add .
git commit -m "cdktf: update ${{ matrix.files }}"
for i in $(seq 1 10); do (git pull origin d-cdktf-docs-${{ github.run_id }}-${{ github.run_number }} --rebase && git push origin d-cdktf-docs-${{ github.run_id }}-${{ github.run_number }}) && break || (git rebase --abort && sleep 15); done
git push origin d-cdktf-docs-${{ github.run_id }}-${{ github.run_number }}
cdktfDocsCreatePR:
needs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-project-board-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ jobs:
ISSUE: ${{ inputs.issue || github.event.issue.number }}
run: |
sleep 5
gh workflow run update-project-board-issue.yml -R hashicorp/terraform-cdk-team -f issue=$ISSUE -f repository=terraform-cdk
gh workflow run update-project-board-issue.yml -R hashicorp/update-project-board -f issue=$ISSUE -f repository=terraform-cdk -f project=125
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
## 0.20.4

### fix

- fix: Make `CDKTF_LOG_FILE_DIRECTORY` a common flag available on all commands [\#3495](https://github.com/hashicorp/terraform-cdk/pull/3495)
- fix(cli): opening browser using CLI hangs the shell process forever [\#3480](https://github.com/hashicorp/terraform-cdk/pull/3480)

### chore

- chore: Upgrade dependencies for util [\#3518](https://github.com/hashicorp/terraform-cdk/pull/3518)
- chore: npm-check-updates && yarn upgrade [\#3511](https://github.com/hashicorp/terraform-cdk/pull/3511)
- chore: Upgrade dependencies for cli [\#3510](https://github.com/hashicorp/terraform-cdk/pull/3510)
- chore: Upgrade dependencies for lib [\#3509](https://github.com/hashicorp/terraform-cdk/pull/3509)
- chore: change schedule time to be before our week starts [\#3508](https://github.com/hashicorp/terraform-cdk/pull/3508)
- chore: Upgrade dependencies for cli [\#3507](https://github.com/hashicorp/terraform-cdk/pull/3507)
- chore: Upgrade dependencies for util [\#3506](https://github.com/hashicorp/terraform-cdk/pull/3506)
- chore: Upgrade dependencies for lib [\#3505](https://github.com/hashicorp/terraform-cdk/pull/3505)
- chore(deps): pin trusted workflows based on HashiCorp TSCCR [\#3504](https://github.com/hashicorp/terraform-cdk/pull/3504)
- chore: Upgrade dependencies for lib [\#3498](https://github.com/hashicorp/terraform-cdk/pull/3498)
- chore: Upgrade dependencies for util [\#3497](https://github.com/hashicorp/terraform-cdk/pull/3497)
- chore: Upgrade dependencies for cli [\#3496](https://github.com/hashicorp/terraform-cdk/pull/3496)
- chore: fix yarn upgrade for cdktf [\#3494](https://github.com/hashicorp/terraform-cdk/pull/3494)
- chore: Upgrade dependencies for cli [\#3493](https://github.com/hashicorp/terraform-cdk/pull/3493)
- chore: Upgrade dependencies for util [\#3492](https://github.com/hashicorp/terraform-cdk/pull/3492)
- chore(deps): pin trusted workflows based on HashiCorp TSCCR [\#3491](https://github.com/hashicorp/terraform-cdk/pull/3491)
- chore: bundle smaller packages together [\#3481](https://github.com/hashicorp/terraform-cdk/pull/3481)
- chore(deps): pin trusted workflows based on HashiCorp TSCCR [\#3479](https://github.com/hashicorp/terraform-cdk/pull/3479)
- chore: Upgrade dependencies for @cdktf/provider-schema [\#3476](https://github.com/hashicorp/terraform-cdk/pull/3476)
- chore: Upgrade dependencies for @cdktf/hcl2cdk [\#3475](https://github.com/hashicorp/terraform-cdk/pull/3475)
- chore: Upgrade dependencies for @cdktf/hcl2json [\#3474](https://github.com/hashicorp/terraform-cdk/pull/3474)
- chore: Upgrade dependencies for @cdktf/commons [\#3473](https://github.com/hashicorp/terraform-cdk/pull/3473)

## 0.20.3

### feat
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "root",
"version": "0.20.3",
"version": "0.20.4",
"private": true,
"scripts": {
"build-and-package": "lerna run --scope 'cdktf*' --scope @cdktf/* build,package && tools/collect-dist.sh",
Expand Down
2 changes: 1 addition & 1 deletion packages/@cdktf/commons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
],
"license": "MPL-2.0",
"dependencies": {
"@sentry/node": "7.101.1",
"@sentry/node": "7.102.1",
"cdktf": "0.0.0",
"ci-info": "3.9.0",
"codemaker": "1.94.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@cdktf/hcl2cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"glob": "10.3.10",
"graphology": "0.25.4",
"graphology-types": "0.24.7",
"jsii-rosetta": "5.3.17",
"jsii-rosetta": "5.3.19",
"prettier": "2.8.8",
"reserved-words": "0.1.2",
"zod": "3.22.4"
Expand All @@ -57,7 +57,7 @@
"@types/deep-equal": "1.0.4",
"@types/glob": "8.1.0",
"@types/jest": "29.5.12",
"@types/node": "18.19.17",
"@types/node": "18.19.18",
"@types/reserved-words": "0.1.4",
"execa": "5.1.1",
"fs-extra": "11.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@cdktf/hcl2json/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"devDependencies": {
"@types/fs-extra": "11.0.4",
"@types/jest": "29.5.12",
"@types/node": "18.19.17",
"@types/node": "18.19.18",
"jest": "29.7.0",
"ts-jest": "29.1.2",
"typescript": "5.2.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/@cdktf/provider-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"dependencies": {
"@cdktf/commons": "0.0.0",
"@cdktf/provider-schema": "0.0.0",
"@types/node": "18.19.17",
"@types/node": "18.19.18",
"codemaker": "1.94.0",
"fs-extra": "8.1.0",
"glob": "10.3.10",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7784,10 +7784,10 @@ jsii-reflect@^1.94.0:
oo-ascii-tree "^1.94.0"
yargs "^16.2.0"

jsii-rosetta@5.3.17:
version "5.3.17"
resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-5.3.17.tgz#41da3255a33a15e48ba9748774240581be337196"
integrity sha512-ctN7Xndh9CHnWsiGRA5l8NQqLN86YO7yIEVTYPW7zTtO0yFWqy8AMwz1Hoc00j2iJ3lXpdJ6qt2ynvndXFj5uA==
jsii-rosetta@5.3.19:
version "5.3.19"
resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-5.3.19.tgz#f726c5f0fae5943cd64ce1033feb2a7b2be2cd29"
integrity sha512-+fQ62AbrgDDN7i6dC6JILVFFOppCABpnzS/eEtbGSMdSy5EF+5kfl61D3UJJEloG+an/WS3VwuiEu1POG1tVkA==
dependencies:
"@jsii/check-node" "1.94.0"
"@jsii/spec" "^1.94.0"
Expand Down

0 comments on commit c0a8fbf

Please sign in to comment.