Skip to content

Commit 672334e

Browse files
author
Javier Toledo
committed
fix: Merge branch 'fix/archiver-and-yaml-dependencies-were-required-after-generating-a-new-project'
2 parents 88c981b + 0d26dd0 commit 672334e

File tree

6 files changed

+59
-11
lines changed

6 files changed

+59
-11
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,7 @@ jobs:
8686
run: git stash
8787

8888
- name: Bump version using Rush
89-
run: node common/scripts/install-run-rush.js version --bump
90-
91-
- name: Pull before publishing
92-
run: git pull --rebase
89+
run: node common/scripts/install-run-rush.js version --bump -b main
9390

9491
- name: Publish using Rush
9592
run: node common/scripts/install-run-rush.js publish --apply --publish --include-all --target-branch origin/main --add-commit-details
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@boostercloud/framework-core",
5+
"comment": "Added missing dependencies to @boostercloud/framework-provider-aws-infrastructure",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@boostercloud/framework-core"
10+
}

common/config/rush/pnpm-lock.yaml

Lines changed: 43 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/config/rush/version-policies.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,6 @@
104104
"policyName": "booster",
105105
"nextBump": "patch",
106106
"mainProject": "@boostercloud/framework-core",
107-
"version": "1.0.0"
107+
"version": "1.0.1"
108108
}
109109
]

packages/framework-integration-tests/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
"ttypescript": "1.5.13",
8585
"typescript": "4.7.4",
8686
"ws": "7.4.5",
87-
"yaml": "1.10.2",
8887
"sinon": "9.2.3",
8988
"eslint-plugin-unicorn": "~44.0.2"
9089
},

packages/framework-provider-aws-infrastructure/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@
4747
"tslib": "^2.4.0",
4848
"promptly": "~3.2.0",
4949
"cdk-assets": "~2.39.1",
50-
"@effect-ts/core": "^0.60.4"
50+
"@effect-ts/core": "^0.60.4",
51+
"yaml": "1.10.2",
52+
"archiver": "5.3.0"
5153
},
5254
"scripts": {
5355
"format": "prettier --write --ext '.js,.ts' **/*.ts **/*/*.ts",
@@ -74,6 +76,7 @@
7476
"@types/rewire": "^2.5.28",
7577
"@types/sinon": "10.0.0",
7678
"@types/sinon-chai": "3.2.5",
79+
"@types/archiver": "5.1.0",
7780
"@typescript-eslint/eslint-plugin": "^5.0.0",
7881
"@typescript-eslint/parser": "^5.0.0",
7982
"chai": "4.2.0",

0 commit comments

Comments
 (0)