Merge pull request #314 from terraform-cdk-providers/upgrade-provider…

…-project-0.1.58

Upgrade provider project to 0.1.58

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
         run: yarn install --check-files --frozen-lockfile
       - name: Set git identity
         run: |-
-          git config user.name "Auto-bump"
+          git config user.name "Automation"
           git config user.email "[email protected]"
       - name: Build
         run: npx projen build

.github/workflows/release.yml

@@ -7,10 +7,11 @@ on:
       - master
   workflow_dispatch: {}
 jobs:
-  build:
+  release:
     runs-on: ubuntu-latest
     env:
       CI: "true"
+      RELEASE: "true"
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -23,31 +24,45 @@ jobs:
       - name: Install dependencies
         run: yarn install --check-files --frozen-lockfile
       - name: Anti-tamper check
-        run: git diff --exit-code
+        run: git diff --ignore-space-at-eol --exit-code
       - name: Set git identity
         run: |-
-          git config user.name "Auto-bump"
+          git config user.name "Automation"
           git config user.email "[email protected]"
       - name: Bump to next version
         run: npx projen bump
+      - name: Install GitHub CLI
+        run: curl -sL
+          https://github.com/cli/cli/releases/download/v1.9.2/gh_1.9.2_linux_amd64.tar.gz
+          | tar -xzv --strip-components=2 gh_1.9.2_linux_amd64/bin/gh && mv gh
+          /usr/bin/
       - name: Build
         run: npx projen build
-      - name: Anti-tamper check
-        run: git diff --exit-code
-      - name: Push commits
-        run: git push origin HEAD:${{ github.ref }}
-      - name: Push tags
-        run: git push --follow-tags origin ${{ github.ref }}
+      - name: Check for new commits
+        id: git_remote
+        run: echo ::set-output name=latest_commit::"$(git ls-remote origin -h ${{
+          github.ref }} | cut -f1)"
+      - name: Create release
+        if: ${{ steps.git_remote.outputs.latest_commit == github.sha }}
+        run: gh release create v$(node -p "require('./package.json').version") -F
+          .changelog.tmp.md -t v$(node -p "require('./package.json').version")
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Unbump
+        run: npx projen unbump
       - name: Upload artifact
+        if: ${{ steps.git_remote.outputs.latest_commit == github.sha }}
         uses: actions/[email protected]
         with:
           name: dist
           path: dist
+      - name: Anti-tamper check
+        run: git diff --ignore-space-at-eol --exit-code
     container:
       image: hashicorp/jsii-terraform
   release_npm:
     name: Release to NPM
-    needs: build
+    needs: release
     runs-on: ubuntu-latest
     container:
       image: jsii/superchain
@@ -65,7 +80,7 @@ jobs:
           NPM_REGISTRY: registry.npmjs.org
   release_pypi:
     name: Release to PyPi
-    needs: build
+    needs: release
     runs-on: ubuntu-latest
     container:
       image: jsii/superchain
@@ -82,7 +97,7 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
   release_nuget:
     name: Release to Nuget
-    needs: build
+    needs: release
     runs-on: ubuntu-latest
     container:
       image: jsii/superchain

.gitignore

@@ -13,6 +13,8 @@
 .nyc_output
 .terraform
 .yarn-integrity
+/.changelog.tmp.md
+/.version.tmp.json
 /coverage
 /dist
 /lib
@@ -51,4 +53,3 @@ yarn-error.log*
 !/src
 !/test
 !/tsconfig.jest.json
-!version.json

.npmignore

@@ -6,7 +6,6 @@
 /.mergify.yml
 /.projen
 /.projenrc.js
-/.versionrc.json
 /.vscode
 /coverage
 /src

.projen/deps.json

@@ -2,7 +2,7 @@
   "dependencies": [
     {
       "name": "@cdktf/provider-project",
-      "version": "^0.1.54",
+      "version": "^0.1.58",
       "type": "build"
     },
     {
@@ -16,12 +16,12 @@
     },
     {
       "name": "cdktf-cli",
-      "version": "^0.2",
+      "version": "^0.3",
       "type": "build"
     },
     {
       "name": "cdktf",
-      "version": "^0.2",
+      "version": "^0.3",
       "type": "build"
     },
     {
@@ -61,7 +61,7 @@
     },
     {
       "name": "projen",
-      "version": "^0.17.37",
+      "version": "^0.17.59",
       "type": "build"
     },
     {
@@ -79,7 +79,7 @@
     },
     {
       "name": "cdktf",
-      "version": "^0.2",
+      "version": "^0.3",
       "type": "peer"
     },
     {

.projen/tasks.json

@@ -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 --abbrev=0 --tags > .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",
@@ -91,31 +115,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 master",
-      "steps": [
-        {
-          "spawn": "bump"
-        },
-        {
-          "exec": "git push --follow-tags origin master"
-        }
-      ],
-      "condition": "! git log --oneline -1 | grep -q \"chore(release):\""
-    },
     "test:watch": {
       "name": "test:watch",
       "category": "10.test",

.versionrc.json

@@ -1,19 +1,19 @@
 {
   "packageFiles": [
     {
-      "filename": "version.json",
-      "type": "json"
+      "filename": ".version.tmp.json",
+      "type": "plain-text"
     }
   ],
   "bumpFiles": [
-    {
-      "filename": "version.json",
-      "type": "json"
-    }
+    "package.json"
   ],
-  "commitAll": true,
-  "scripts": {
-    "postbump": "npx projen && git add ."
+  "commitAll": false,
+  "infile": ".changelog.tmp.md",
+  "header": "",
+  "skip": {
+    "commit": true,
+    "tag": true
   },
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }