fixes, updates and smaller size

Author: daimor

.github/workflows/main.yml

@@ -12,7 +12,7 @@ on:
       - master
   release:
     types:
-      - created
+      - released
 jobs:
   build:
     timeout-minutes: 10
@@ -21,7 +21,7 @@ jobs:
       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
@@ -35,17 +35,17 @@ 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
         tmp=$(mktemp)
         jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json
         mkdir dist
-        echo $VERSION > ./dist/.version
-        echo $NAME > ./dist/.name
+        echo $VERSION > .version
+        echo $NAME > .name
     - name: Use Node.js
-      uses: actions/setup-node@master
+      uses: actions/setup-node@v1
       with:
         node-version: 12.x
     - run: npm install
@@ -60,31 +60,41 @@ jobs:
     - name: Build package
       if: runner.os == 'Linux'
       run: |
-        ./node_modules/.bin/vsce package -o ./dist/package.vsix
-    - uses: actions/upload-artifact@master
+        npx vsce package -o ${{ steps.set-version.outputs.name }}.vsix
+    - uses: actions/upload-artifact@v2
+      if: runner.os == 'Linux'
+      with:
+        name: ${{ steps.set-version.outputs.name }}.vsix
+        path: ${{ steps.set-version.outputs.name }}.vsix
+    - uses: actions/upload-artifact@v2
       if: runner.os == 'Linux'
       with:
-        name: vsix
-        path: ./dist/
+        name: meta
+        path: |
+          .name
+          .version
   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/
+        name: meta
+        path: .
     - name: Set an output
       id: set-version
       if: runner.os == 'Linux'
       run: |
         set -x
-        echo ::set-output name=version::`cat ./dist/.version`
-        echo ::set-output name=name::`cat ./dist/.name`
+        echo ::set-output name=version::`cat .version`
+        echo ::set-output name=name::`cat .name`
+    - uses: actions/download-artifact@v2
+      with:
+        name: ${{ steps.set-version.outputs.name }}.vsix
     - 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 }}
@@ -97,13 +107,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: ${{ steps.set-version.outputs.name }}.vsix
         asset_name: ${{ steps.set-version.outputs.name }}.vsix
         asset_content_type: application/zip
   publish:
@@ -114,20 +124,21 @@ jobs:
     - uses: actions/checkout@v2
       with:
         ref: master
-    - uses: actions/download-artifact@master
+        token: ${{ secrets.TOKEN }}
+    - uses: actions/download-artifact@v2
       with:
-        name: vsix
-        path: ./dist/
+        name: meta
+        path: .
     - name: Use Node.js
-      uses: actions/setup-node@master
+      uses: actions/setup-node@v1
       with:
         node-version: 12.x
     - name: Prepare build
       id: set-version
       run: |
-        VERSION=`cat ./dist/.version`
-        NEXT_VERSION=`cat ./dist/.version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=.`
-        echo ::set-output name=name::`cat ./dist/.name`
+        VERSION=`cat .version`
+        NEXT_VERSION=`cat .version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=.`
+        echo ::set-output name=name::`cat .name`
         tmp=$(mktemp)
         git config --global user.name 'ProjectBot'
         git config --global user.email '[email protected]'
@@ -137,21 +148,26 @@ 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: Build package
+      run: |
+        npx vsce package -o ${{ steps.set-version.outputs.name }}.vsix
     - 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: ${{ 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: |
-        vsce publish -p ${{ secrets.VSCE_TOKEN }}
-        ovsx publish --pat ${{ secrets.OVSX_TOKEN }}
-
+        [ -n "${{ secrets.VSCE_TOKEN }}" ] && \
+          npx vsce publish --packagePath ${{ steps.set-version.outputs.name }}.vsix -p ${{ secrets.VSCE_TOKEN }} || true
+    - name: Publish to Open VSX Registry
+      run: |
+        [ -n "${{ secrets.OVSX_TOKEN }}" ] && \
+          npx ovsx publish ${{ steps.set-version.outputs.name }}.vsix --pat ${{ secrets.OVSX_TOKEN }} || true

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
 node_modules/
 out/
+dist/
 *.vsix

.vscode/settings.json

@@ -7,5 +7,20 @@
         "out": true // set this to false to include "out" folder in search results
     },
     // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
-    "typescript.tsc.autoDetect": "off"
+    "typescript.tsc.autoDetect": "off",
+    "sqltools.connections": [
+        {
+            "namespace": "USER",
+            "connectionMethod": "Server and Port",
+            "showSystem": false,
+            "previewLimit": 50,
+            "server": "localhost",
+            "port": 52773,
+            "askForPassword": false,
+            "driver": "InterSystems IRIS",
+            "name": "iris",
+            "username": "_SYSTEM",
+            "password": "SYS"
+        }
+    ]
 }

.vscodeignore

@@ -1,10 +1,10 @@
-.github/**
-.vscode/**
-.vscode-test/**
-out/test/**
-**/*.ts
-**/*.map
-.gitignore
-**/tsconfig.json
-**/tslint.json
-**/.eslintrc.json
+**
+!dist/**/*.js
+!icons
+!docs
+!README.md
+!CHANGELOG.md
+!LICENSE
+!package.json
+!ui.schema.json
+!connection.schema.json