Merge pull request #2 from InterWorkAlliance/update-model

Update model

.github/workflows/build.yml

@@ -2,20 +2,16 @@ name: Build
 
 on:
   push:
-    branches: 
-    - master
-    - release/v*
-  pull_request:
     branches:
-    - master
-    - release/v*
+    - "**"
+    - "!master"
 
 jobs:
 
   buildgrpc:
     strategy:
       matrix:
-        electron-version: [ '9.2.1', '9.3.3' ]
+        electron-version: [ '9.3.3', '11.2.1' ]
         runs-on: [ 'windows-2019', 'ubuntu-18.04', 'macos-10.15' ]
     runs-on: ${{ matrix.runs-on }}
     steps:
@@ -29,7 +25,7 @@ jobs:
       uses: actions/cache@v1
       with:
         path: node_modules
-        key: ${{ runner.os }}-${{ matrix.electron-version }}-build-grpc-cache-node-modules-${{ hashFiles('**/package-lock.json') }}
+        key: cache-${{ runner.os }}-${{ matrix.electron-version }}-build-grpc-cache-node-modules-${{ hashFiles('**/package-lock.json') }}
     - name: 🚀 Build
       run: |
         npm install
@@ -54,9 +50,9 @@ jobs:
       with:
         node-version: 12.x
     - name: 💿 Setup .NET Core SDK
-      uses: actions/setup-dotnet@v1.5.0
+      uses: actions/setup-dotnet@v1.7.2
       with:
-        dotnet-version: 2.1.x
+        dotnet-version: 3.1.x
     - name: 💾 Get GRPC binaries
       uses: actions/download-artifact@v2
       with:
@@ -86,11 +82,3 @@ jobs:
       with:
         name: vsix
         path: token-designer-*.vsix
-    - name: 🌎 Release
-      uses: djnicholson/[email protected]
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        tag-name: vNext
-        release-name: 'vNext'
-        asset-name: 'token-designer.vsix'
-        file: 'token-designer.vsix'

.github/workflows/buildandrelease.yml

@@ -0,0 +1,96 @@
+name: BuildAndRelease
+
+on:
+  push:
+    branches: 
+    - master
+    - release/v*
+  pull_request:
+    branches:
+    - master
+    - release/v*
+
+jobs:
+
+  buildgrpc:
+    strategy:
+      matrix:
+        electron-version: [ '9.3.3', '11.2.1' ]
+        runs-on: [ 'windows-2019', 'ubuntu-18.04', 'macos-10.15' ]
+    runs-on: ${{ matrix.runs-on }}
+    steps:
+    - name: ⏳ Checkout
+      uses: actions/checkout@v2
+    - name: 💿 Setup NodeJS
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12.x
+    - name: 💾 Cache node_modules
+      uses: actions/cache@v1
+      with:
+        path: node_modules
+        key: cache-${{ runner.os }}-${{ matrix.electron-version }}-build-grpc-cache-node-modules-${{ hashFiles('**/package-lock.json') }}
+    - name: 🚀 Build
+      run: |
+        npm install
+        npm rebuild --target=${{ matrix.electron-version }} --runtime=electron --dist-url=https://atom.io/download/electron
+    - name: 🌎 Publish
+      uses: actions/upload-artifact@v2
+      with:
+        name: grpc-${{ matrix.runs-on }}-${{ matrix.electron-version }}
+        path: node_modules/grpc/src/node/extension_binary/*electron*/**/*
+
+  buildextension:
+    runs-on: ubuntu-18.04
+    needs: buildgrpc
+    steps:
+    - name: ⏳ Checkout
+      uses: actions/checkout@v2
+      # fetch-depth 0 needed due to https://github.com/dotnet/Nerdbank.GitVersioning/issues/423
+      with:
+        fetch-depth: 0
+    - name: 💿 Setup NodeJS
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12.x
+    - name: 💿 Setup .NET Core SDK
+      uses: actions/[email protected]
+      with:
+        dotnet-version: 3.1.x
+    - name: 💾 Get GRPC binaries
+      uses: actions/download-artifact@v2
+      with:
+        path: grpc_artifacts
+    - name: 🚀 Build
+      run: |
+        npm install
+        for d in grpc_artifacts/* ; do mv ${d}/* node_modules/grpc/src/node/extension_binary/ ; done
+        npm run compile
+    - name: 🔢 Set version
+      run: npm run setversion
+    - name: 🎁 Package
+      id: package
+      shell: bash
+      run: |
+        npm run package
+        cp token-designer-*.vsix token-designer.vsix
+        echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+        ls -l *.vsix
+    - name: 🗑 Artifact cleanup
+      uses: kolpav/purge-artifacts-action@v1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        expire-in: 24 hours
+    - name: 🌎 Publish Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: vsix
+        path: token-designer-*.vsix
+    - name: 🌎 Release
+      uses: djnicholson/[email protected]
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        tag-name: vNext
+        release-name: 'vNext'
+        asset-name: 'token-designer.vsix'
+        file: 'token-designer.vsix'