Skip to content

Commit

Permalink
Merge pull request #33 from wchaws/dev
Browse files Browse the repository at this point in the history
chore: upgrade projen
  • Loading branch information
wchaws authored May 3, 2021
2 parents 2ae4d13 + c1e1805 commit 9f49907
Show file tree
Hide file tree
Showing 10 changed files with 102 additions and 58 deletions.
18 changes: 18 additions & 0 deletions .gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 10 additions & 3 deletions .github/workflows/build.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 20 additions & 10 deletions .github/workflows/release.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
.jsii
.nyc_output
.yarn-integrity
/.changelog.tmp.md
/.version.tmp.json
/coverage
/dist
/lib
Expand All @@ -31,6 +33,7 @@ tsconfig.json
yarn-debug.log*
yarn-error.log*
!/.eslintrc.json
!/.gitattributes
!/.github/dependabot.yml
!/.github/pull_request_template.md
!/.github/workflows/build.yml
Expand All @@ -48,4 +51,3 @@ yarn-error.log*
!/test
!/tsconfig.eslint.json
!/tsconfig.jest.json
!version.json
1 change: 0 additions & 1 deletion .npmignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .projen/deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
},
{
"name": "projen",
"version": "^0.17.47",
"version": "^0.17.75",
"type": "build"
},
{
Expand Down
57 changes: 32 additions & 25 deletions .projen/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,30 @@
],
"condition": "git diff --exit-code > /dev/null"
},
"bump": {
"name": "bump",
"category": "20.release",
"description": "Bumps version based on latest git tag and generates a changelog entry",
"steps": [
{
"exec": "git describe --tags --match=\"v*\" --first-parent --abbrev=0 > .version.tmp.json"
},
{
"exec": "standard-version"
}
],
"condition": "! git log --oneline -1 | grep -q \"chore(release):\""
},
"unbump": {
"name": "unbump",
"category": "20.release",
"description": "Restores version to 0.0.0",
"steps": [
{
"exec": "standard-version -r 0.0.0"
}
]
},
"compile": {
"name": "compile",
"category": "00.build",
Expand Down Expand Up @@ -94,31 +118,6 @@
}
]
},
"bump": {
"name": "bump",
"category": "20.release",
"description": "Commits a bump to the package version based on conventional commits",
"steps": [
{
"exec": "standard-version"
}
],
"condition": "! git log --oneline -1 | grep -q \"chore(release):\""
},
"release": {
"name": "release",
"category": "20.release",
"description": "Bumps version & push to main",
"steps": [
{
"spawn": "bump"
},
{
"exec": "git push --follow-tags origin main"
}
],
"condition": "! git log --oneline -1 | grep -q \"chore(release):\""
},
"test:watch": {
"name": "test:watch",
"category": "10.test",
Expand Down Expand Up @@ -152,6 +151,14 @@
}
]
},
"default": {
"name": "default",
"steps": [
{
"exec": "node .projenrc.js"
}
]
},
"watch": {
"name": "watch",
"category": "00.build",
Expand Down
18 changes: 9 additions & 9 deletions .versionrc.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9f49907

Please sign in to comment.