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

Commit 674bcdc

Browse files
author
Elad Ben-Israel
authored
chore: projen upgrade (#83)
1 parent e540d8e commit 674bcdc

17 files changed

+482
-298
lines changed

‎.eslintrc.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"parserOptions": {
1313
"ecmaVersion": 2018,
1414
"sourceType": "module",
15-
"project": "./tsconfig.jest.json"
15+
"project": "./tsconfig.eslint.json"
1616
},
1717
"extends": [
1818
"plugin:import/typescript"
@@ -27,7 +27,7 @@
2727
"import/resolver": {
2828
"node": {},
2929
"typescript": {
30-
"directory": "./tsconfig.json"
30+
"project": "./tsconfig.eslint.json"
3131
}
3232
}
3333
},
@@ -124,8 +124,8 @@
124124
"error",
125125
{
126126
"devDependencies": [
127-
"**/build-tools/**",
128-
"**/test/**"
127+
"**/test/**",
128+
"**/build-tools/**"
129129
],
130130
"optionalDependencies": false,
131131
"peerDependencies": true
@@ -227,4 +227,4 @@
227227
}
228228
}
229229
]
230-
}
230+
}

‎.github/workflows/build.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
2+
23
name: Build
34
on:
45
pull_request: {}

‎.github/workflows/projenupgrade.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
2+
3+
name: ProjenUpgrade
4+
on:
5+
schedule:
6+
- cron: 0 6 * * *
7+
workflow_dispatch: {}
8+
jobs:
9+
upgrade:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v2
14+
- name: Install dependencies
15+
run: yarn install --check-files --frozen-lockfile
16+
- name: Synthesize project files
17+
run: npx projen
18+
- name: Upgrade projen
19+
run: npx projen projen:upgrade
20+
- name: Create pull request
21+
uses: peter-evans/create-pull-request@v3
22+
with:
23+
token: ${{ secrets.PROJEN_GITHUB_TOKEN }}
24+
commit-message: "chore: upgrade projen"
25+
branch: auto/projen-upgrade
26+
title: "chore: upgrade projen"
27+
body: This PR upgrades projen to the latest version
28+
labels: auto-merge

‎.github/workflows/rebuild-bot.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
2+
23
name: rebuild-bot
34
on:
4-
issue_comment:
5-
types:
6-
- created
75
workflow_dispatch: {}
86
jobs:
97
build:
@@ -46,7 +44,11 @@ jobs:
4644
run: npx projen build
4745
- name: Commit changes
4846
run: 'git commit -am "chore: update generated files"'
49-
- name: Push changes
47+
- name: Push commits
48+
run: git push origin $BRANCH
49+
env:
50+
BRANCH: ${{ steps.query_pull_request.outputs.branch }}
51+
- name: Push tags
5052
run: git push --follow-tags origin $BRANCH
5153
env:
5254
BRANCH: ${{ steps.query_pull_request.outputs.branch }}

‎.github/workflows/release.yml

+16-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
2+
23
name: Release
34
on:
45
push:
@@ -13,6 +14,8 @@ jobs:
1314
steps:
1415
- name: Checkout
1516
uses: actions/checkout@v2
17+
with:
18+
fetch-depth: 0
1619
- name: Install dependencies
1720
run: yarn install --check-files --frozen-lockfile
1821
- name: Synthesize project files
@@ -23,12 +26,17 @@ jobs:
2326
run: |-
2427
git config user.name "Auto-bump"
2528
git config user.email "[email protected]"
26-
- run: npx projen bump
29+
- name: Bump to next version
30+
run: npx projen bump
2731
- name: Build
2832
run: npx projen build
2933
- name: Anti-tamper check
3034
run: git diff --exit-code
31-
- name: Push changes
35+
- name: Push commits
36+
run: git push origin $BRANCH
37+
env:
38+
BRANCH: ${{ github.ref }}
39+
- name: Push tags
3240
run: git push --follow-tags origin $BRANCH
3341
env:
3442
BRANCH: ${{ github.ref }}
@@ -47,11 +55,12 @@ jobs:
4755
image: jsii/superchain
4856
steps:
4957
- name: Download build artifacts
50-
uses: actions/download-artifact@v1
58+
uses: actions/download-artifact@v2
5159
with:
5260
name: dist
61+
path: dist
5362
- name: Release
54-
run: npx -p jsii-release jsii-release-npm
63+
run: npx -p jsii-release@latest jsii-release-npm
5564
env:
5665
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
5766
NPM_DIST_TAG: latest
@@ -64,11 +73,12 @@ jobs:
6473
image: jsii/superchain
6574
steps:
6675
- name: Download build artifacts
67-
uses: actions/download-artifact@v1
76+
uses: actions/download-artifact@v2
6877
with:
6978
name: dist
79+
path: dist
7080
- name: Release
71-
run: npx -p jsii-release jsii-release-pypi
81+
run: npx -p jsii-release@latest jsii-release-pypi
7282
env:
7383
TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
7484
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}

‎.gitignore

+37-48
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,52 @@
11
# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
2-
# Logs
3-
logs
2+
*.lcov
43
*.log
5-
npm-debug.log*
6-
yarn-debug.log*
7-
yarn-error.log*
8-
lerna-debug.log*
9-
# Diagnostic reports (https://nodejs.org/api/report.html)
10-
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
11-
# Runtime data
12-
pids
134
*.pid
14-
*.seed
155
*.pid.lock
16-
# Directory for instrumented libs generated by jscoverage/JSCover
17-
lib-cov
18-
# Coverage directory used by tools like istanbul
19-
coverage
20-
*.lcov
21-
# nyc test coverage
22-
.nyc_output
23-
# Compiled binary addons (https://nodejs.org/api/addons.html)
24-
build/Release
25-
# Dependency directories
26-
node_modules/
27-
jspm_packages/
28-
# TypeScript cache
6+
*.seed
7+
*.tgz
298
*.tsbuildinfo
30-
# Optional eslint cache
9+
.cache
3110
.eslintcache
32-
# Output of 'npm pack'
33-
*.tgz
34-
# Yarn Integrity file
11+
.jsii
12+
.nyc_output
3513
.yarn-integrity
36-
# parcel-bundler cache (https://parceljs.org/)
37-
.cache
38-
# jest-junit artifacts
39-
/test-reports/
40-
junit.xml
4114
/coverage
42-
/lib
4315
/dist
44-
.jsii
16+
/lib
17+
/test-reports/
18+
build/Release
19+
coverage
20+
jspm_packages/
21+
junit.xml
22+
lerna-debug.log*
23+
lib-cov
24+
logs
25+
node_modules/
26+
npm-debug.log*
27+
pids
28+
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
4529
tsconfig.json
46-
!/.projen/tasks.json
47-
!/package.json
48-
!/.npmignore
49-
!/LICENSE
50-
!/.projenrc.js
51-
!version.json
52-
!/.versionrc.json
53-
!/test
54-
!/.github/workflows/build.yml
55-
!/.github/workflows/release.yml
56-
!/.mergify.yml
30+
yarn-debug.log*
31+
yarn-error.log*
32+
!/.eslintrc.json
5733
!/.github/dependabot.yml
5834
!/.github/pull_request_template.md
35+
!/.github/workflows/build.yml
36+
!/.github/workflows/projenupgrade.yml
5937
!/.github/workflows/rebuild-bot.yml
38+
!/.github/workflows/release.yml
39+
!/.mergify.yml
40+
!/.npmignore
41+
!/.projen/deps.json
42+
!/.projen/tasks.json
43+
!/.projenrc.js
44+
!/.versionrc.json
45+
!/API.md
46+
!/LICENSE
47+
!/package.json
6048
!/src
49+
!/test
50+
!/tsconfig.eslint.json
6151
!/tsconfig.jest.json
62-
!/.eslintrc.json
63-
!/API.md
52+
!version.json

‎.mergify.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,7 @@ pull_request_rules:
2929
- status-success=build
3030
actions:
3131
merge:
32-
method: merge
32+
method: squash
3333
commit_message: title+body
34+
strict: smart
35+
strict_method: merge

‎.npmignore

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
2+
/.eslintrc.json
3+
/.github
4+
/.idea
5+
/.mergify.yml
6+
/.projen
27
/.projenrc.js
38
/.versionrc.json
9+
/.vscode
410
/coverage
5-
/test
6-
/.mergify.yml
711
/src
8-
dist
9-
/tsconfig.json
10-
/.github
11-
/.vscode
12-
/.idea
13-
/.projenrc.js
12+
/test
13+
/test-reports/
14+
/tsconfig.eslint.json
1415
/tsconfig.jest.json
15-
/.eslintrc.json
16+
/tsconfig.json
17+
dist
18+
junit.xml
19+
!.jsii
1620
!/lib
17-
!/lib/**/*.js
1821
!/lib/**/*.d.ts
19-
!.jsii
22+
!/lib/**/*.js

0 commit comments

Comments
 (0)