From f4afdb15b8f5d6a21e733402809d2721108f502f Mon Sep 17 00:00:00 2001 From: eladb Date: Thu, 25 Mar 2021 06:03:21 +0000 Subject: [PATCH] chore: upgrade projen --- .github/workflows/build.yml | 10 ++++++---- .github/workflows/release.yml | 8 ++------ .projen/deps.json | 2 +- package.json | 8 ++++---- yarn.lock | 8 ++++---- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 089d57c..42c4870 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,19 +12,21 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: Synthesize project files run: npx projen - - name: Anti-tamper check - run: git diff --exit-code - name: Set git identity run: |- git config user.name "Auto-bump" git config user.email "github-actions@github.com" - name: Build run: npx projen build - - name: Anti-tamper check - run: git diff --exit-code + - name: Commit and push changes (if any) + run: 'git diff --exit-code || (git commit -am "chore: self mutation" && git push + origin HEAD:${{ github.event.pull_request.head.ref }})' container: image: jsii/superchain diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 708b706..7439c8c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,13 +33,9 @@ jobs: - name: Anti-tamper check run: git diff --exit-code - name: Push commits - run: git push origin $BRANCH - env: - BRANCH: ${{ github.ref }} + run: git push origin HEAD:${{ github.ref }} - name: Push tags - run: git push --follow-tags origin $BRANCH - env: - BRANCH: ${{ github.ref }} + run: git push --follow-tags origin ${{ github.ref }} - name: Upload artifact uses: actions/upload-artifact@v2.1.1 with: diff --git a/.projen/deps.json b/.projen/deps.json index ad5bfa1..7cd1b86 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -73,7 +73,7 @@ }, { "name": "projen", - "version": "^0.17.0", + "version": "^0.17.17", "type": "build" }, { diff --git a/package.json b/package.json index 0262879..1b78d42 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,6 @@ "url": "https://github.com/eladb/cfunctions.git" }, "scripts": { - "projen": "npx projen", - "start": "npx projen start", "clobber": "npx projen clobber", "compile": "npx projen compile", "test:compile": "npx projen test:compile", @@ -21,7 +19,9 @@ "package": "npx projen package", "eslint": "npx projen eslint", "compat": "npx projen compat", - "docgen": "npx projen docgen" + "docgen": "npx projen docgen", + "projen": "npx projen", + "start": "npx projen start" }, "author": { "name": "Elad Ben-Israel", @@ -46,7 +46,7 @@ "jsii-docgen": "^1.4.114", "jsii-pacmak": "^1.16.0", "json-schema": "^0.2.5", - "projen": "^0.17.0", + "projen": "^0.17.17", "standard-version": "^9", "ts-jest": "^26.4.4", "typescript": "^3.9.5" diff --git a/yarn.lock b/yarn.lock index 5efb972..548eac7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4644,10 +4644,10 @@ progress@^2.0.0: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -projen@^0.17.0: - version "0.17.0" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.17.0.tgz#9a7c6deff77a3a76f24abc0ccb6563f23eae6fb1" - integrity sha512-t8Vg7tXLPMqi7PPJPCIujzv6jD3hHrnSXwXjECJZBh0+zeAdFuu6H46ztIiu0I73h0QOTMfyRxlRoMn4YKtxoQ== +projen@^0.17.17: + version "0.17.17" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.17.17.tgz#497333f5ab23dac13b600bdbdb686c97d230ee41" + integrity sha512-4Or7h/ABz2w7F9+0s7jGLi+aS7iV5im290fR/yz9PEsaHYro8+W3khFjUzNz3K93M0m5qBAN3Mp2rtaFYbg0SQ== dependencies: "@iarna/toml" "^2.2.5" chalk "^4.1.0"