Merge pull request #17 from intersystems-community/workflow_changes

several changes to workflow file

Author: gjsjohnmurray

.github/workflows/main.yml

@@ -5,6 +5,9 @@ on:
     branches:
       - master
     paths-ignore:
+      - 'docs/**'
+      - '.vscode/**'
+      - '.github/**'
       - '*.md'
       - '**/*.md'
   pull_request:
@@ -15,12 +18,13 @@ on:
       - created
 jobs:
   build:
+    timeout-minutes: 10
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v2
     - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
     - name: Set an output
       id: set-version
@@ -34,7 +38,7 @@ jobs:
         echo ::set-output name=changelog::$CHANGELOG
         git tag -l | cat
         [ $GITHUB_EVENT_NAME == 'push' ] && VERSION+=-beta && VERSION+=.$(($(git tag -l "v$VERSION.*" | sort -nt. -k4 2>/dev/null | tail -1 | cut -d. -f4)+1))
-        [ $GITHUB_EVENT_NAME == 'pull_request' ] && VERSION+=-dev
+        [ $GITHUB_EVENT_NAME == 'pull_request' ] && VERSION+=-dev.${{ github.event.pull_request.number }}
         echo ::set-output name=version::$VERSION
         NAME=$(jq -r '.name' package.json)-$VERSION
         echo ::set-output name=name::$NAME
@@ -44,7 +48,7 @@ jobs:
         echo $VERSION > ./dist/.version
         echo $NAME > ./dist/.name
     - name: Use Node.js
-      uses: actions/setup-node@master
+      uses: actions/setup-node@v1
       with:
         node-version: 12.x
     - run: npm install
@@ -56,18 +60,18 @@ jobs:
     - name: Build package
       if: runner.os == 'Linux'
       run: |
-        ./node_modules/.bin/vsce package -o ./dist/package.vsix
-    - uses: actions/upload-artifact@master
+        ./node_modules/.bin/vsce package -o ./dist/${{ steps.set-version.outputs.name }}.vsix
+    - uses: actions/upload-artifact@v2
       if: runner.os == 'Linux'
       with:
         name: vsix
-        path: ./dist/
+        path: ./dist/${{ steps.set-version.outputs.name }}.vsix
   beta:
     if: (github.event_name == 'push')
     runs-on: ubuntu-latest
     needs: build
     steps:
-    - uses: actions/download-artifact@master
+    - uses: actions/download-artifact@v2
       with:
         name: vsix
         path: ./dist/
@@ -80,7 +84,7 @@ jobs:
         echo ::set-output name=name::`cat ./dist/.name`
     - name: Create Release
       id: create_release
-      uses: actions/create-release@master
+      uses: actions/create-release@v1
       if: runner.os == 'Linux'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -93,13 +97,13 @@ jobs:
           ${{ steps.set-version.outputs.changelog }}
     - name: Upload Release Asset
       id: upload-release-asset
-      uses: actions/upload-release-asset@master
+      uses: actions/upload-release-asset@v1
       if: runner.os == 'Linux'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./dist/package.vsix
+        asset_path: ./dist/${{ steps.set-version.outputs.name }}.vsix
         asset_name: ${{ steps.set-version.outputs.name }}.vsix
         asset_content_type: application/zip
   publish:
@@ -110,12 +114,12 @@ jobs:
     - uses: actions/checkout@v2
       with:
         ref: master
-    - uses: actions/download-artifact@master
+    - uses: actions/download-artifact@v2
       with:
         name: vsix
         path: ./dist/
     - name: Use Node.js
-      uses: actions/setup-node@master
+      uses: actions/setup-node@v1
       with:
         node-version: 12.x
     - name: Prepare build
@@ -133,21 +137,22 @@ jobs:
         jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json
         jq '.enableProposedApi = false' package.json > "$tmp" && mv "$tmp" package.json
         npm install
-        npm i -g vsce ovsx
         git push
     - name: Upload Release Asset
       id: upload-release-asset
-      uses: actions/upload-release-asset@master
+      uses: actions/upload-release-asset@v1
       if: runner.os == 'Linux'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./dist/package.vsix
+        asset_path: ./dist/${{ steps.set-version.outputs.name }}.vsix
         asset_name: ${{ steps.set-version.outputs.name }}.vsix
         asset_content_type: application/zip
-    - name: Publish to Marketplaces
+    - name: Publish to VSCode Marketplace
+      run: |
+        [ -n "${{ secrets.VSCE_TOKEN }}" ] && ./node_modules/.bin/vsce publish -p ${{ secrets.VSCE_TOKEN }} || true
+    - name: Publish to Open VSX Registry
       run: |
-        vsce publish -p ${{ secrets.VSCE_TOKEN }}
-        ovsx publish --pat ${{ secrets.OVSX_TOKEN }}
+        [ -n "${{ secrets.OVSX_TOKEN }}" ] && ./node_modules/.bin/ovsx publish --pat ${{ secrets.OVSX_TOKEN }} || true
 

package-lock.json

@@ -45,11 +45,12 @@
   },
   "devDependencies": {
     "@types/glob": "^7.1.1",
+    "@types/keytar": "^4.4.2",
     "@types/mocha": "^5.2.6",
     "@types/node": "^8.10.60",
-    "@types/keytar": "^4.4.2",
     "glob": "^7.1.6",
     "mocha": "^7.1.2",
+    "ovsx": "latest",
     "ts-loader": "^6.2.2",
     "tslint": "^5.20.1",
     "typescript": "^3.8.3",