Skip to content
This repository was archived by the owner on Jan 28, 2022. It is now read-only.

Commit 47413a1

Browse files
authored
Merge pull request #101 from awslabs/auto/projen-upgrade
chore: upgrade projen
2 parents abd6c2f + f4afdb1 commit 47413a1

File tree

5 files changed

+17
-19
lines changed

5 files changed

+17
-19
lines changed

.github/workflows/build.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,21 @@ jobs:
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v2
15+
with:
16+
ref: ${{ github.event.pull_request.head.ref }}
17+
repository: ${{ github.event.pull_request.head.repo.full_name }}
1518
- name: Install dependencies
1619
run: yarn install --check-files --frozen-lockfile
1720
- name: Synthesize project files
1821
run: npx projen
19-
- name: Anti-tamper check
20-
run: git diff --exit-code
2122
- name: Set git identity
2223
run: |-
2324
git config user.name "Auto-bump"
2425
git config user.email "[email protected]"
2526
- name: Build
2627
run: npx projen build
27-
- name: Anti-tamper check
28-
run: git diff --exit-code
28+
- name: Commit and push changes (if any)
29+
run: 'git diff --exit-code || (git commit -am "chore: self mutation" && git push
30+
origin HEAD:${{ github.event.pull_request.head.ref }})'
2931
container:
3032
image: jsii/superchain

.github/workflows/release.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,9 @@ jobs:
3333
- name: Anti-tamper check
3434
run: git diff --exit-code
3535
- name: Push commits
36-
run: git push origin $BRANCH
37-
env:
38-
BRANCH: ${{ github.ref }}
36+
run: git push origin HEAD:${{ github.ref }}
3937
- name: Push tags
40-
run: git push --follow-tags origin $BRANCH
41-
env:
42-
BRANCH: ${{ github.ref }}
38+
run: git push --follow-tags origin ${{ github.ref }}
4339
- name: Upload artifact
4440
uses: actions/[email protected]
4541
with:

.projen/deps.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
},
7474
{
7575
"name": "projen",
76-
"version": "^0.17.0",
76+
"version": "^0.17.17",
7777
"type": "build"
7878
},
7979
{

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
"url": "https://github.com/eladb/cfunctions.git"
66
},
77
"scripts": {
8-
"projen": "npx projen",
9-
"start": "npx projen start",
108
"clobber": "npx projen clobber",
119
"compile": "npx projen compile",
1210
"test:compile": "npx projen test:compile",
@@ -21,7 +19,9 @@
2119
"package": "npx projen package",
2220
"eslint": "npx projen eslint",
2321
"compat": "npx projen compat",
24-
"docgen": "npx projen docgen"
22+
"docgen": "npx projen docgen",
23+
"projen": "npx projen",
24+
"start": "npx projen start"
2525
},
2626
"author": {
2727
"name": "Elad Ben-Israel",
@@ -46,7 +46,7 @@
4646
"jsii-docgen": "^1.4.114",
4747
"jsii-pacmak": "^1.16.0",
4848
"json-schema": "^0.2.5",
49-
"projen": "^0.17.0",
49+
"projen": "^0.17.17",
5050
"standard-version": "^9",
5151
"ts-jest": "^26.4.4",
5252
"typescript": "^3.9.5"

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -4644,10 +4644,10 @@ progress@^2.0.0:
46444644
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
46454645
integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
46464646

4647-
projen@^0.17.0:
4648-
version "0.17.0"
4649-
resolved "https://registry.yarnpkg.com/projen/-/projen-0.17.0.tgz#9a7c6deff77a3a76f24abc0ccb6563f23eae6fb1"
4650-
integrity sha512-t8Vg7tXLPMqi7PPJPCIujzv6jD3hHrnSXwXjECJZBh0+zeAdFuu6H46ztIiu0I73h0QOTMfyRxlRoMn4YKtxoQ==
4647+
projen@^0.17.17:
4648+
version "0.17.17"
4649+
resolved "https://registry.yarnpkg.com/projen/-/projen-0.17.17.tgz#497333f5ab23dac13b600bdbdb686c97d230ee41"
4650+
integrity sha512-4Or7h/ABz2w7F9+0s7jGLi+aS7iV5im290fR/yz9PEsaHYro8+W3khFjUzNz3K93M0m5qBAN3Mp2rtaFYbg0SQ==
46514651
dependencies:
46524652
"@iarna/toml" "^2.2.5"
46534653
chalk "^4.1.0"

0 commit comments

Comments
 (0)