Skip to content

Commit bcbc127

Browse files
isc-bsavianoisc-bsaviano
authored
Rename and change logo of View Container (#216)
1 parent 0fd085d commit bcbc127

File tree

14 files changed

+1294
-2527
lines changed

14 files changed

+1294
-2527
lines changed

‎.github/workflows/main.yml

Lines changed: 21 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
version: ${{ steps.set-version.outputs.version }}
2929
taggedbranch: ${{ steps.find-branch.outputs.taggedbranch }}
3030
steps:
31-
- uses: actions/checkout@v2
31+
- uses: actions/checkout@v3
3232
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
3333
- name: Find which branch the release tag points at
3434
id: find-branch
@@ -38,7 +38,7 @@ jobs:
3838
git fetch --depth=1 origin +refs/heads/*:refs/heads/*
3939
set -x
4040
TAGGEDBRANCH=$(git for-each-ref --points-at=${{github.sha}} --format='%(refname:lstrip=2)' refs/heads/)
41-
echo ::set-output name=taggedbranch::$TAGGEDBRANCH
41+
echo "taggedbranch=$TAGGEDBRANCH" >> $GITHUB_OUTPUT
4242
- name: Set an output
4343
id: set-version
4444
if: runner.os == 'Windows'
@@ -49,33 +49,33 @@ jobs:
4949
[ $GITHUB_EVENT_NAME == 'release' ] && VERSION=${{ github.event.release.tag_name }} && VERSION=${VERSION/v/}
5050
CHANGELOG=$(cat CHANGELOG.md | sed -n "/## \[${VERSION}\]/,/## /p" | sed '/^$/d;1d;$d')
5151
CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
52-
echo ::set-output name=changelog::$CHANGELOG
52+
echo "changelog=$CHANGELOG" >> $GITHUB_OUTPUT
5353
git tag -l | cat
5454
[ $GITHUB_EVENT_NAME == 'push' ] && VERSION+=-beta && VERSION+=.$(($(git tag -l "v$VERSION.*" | sort -nt. -k4 2>/dev/null | tail -1 | cut -d. -f4)+1))
5555
[ $GITHUB_EVENT_NAME == 'pull_request' ] && VERSION+=-dev.${{ github.event.pull_request.number }}
56-
echo ::set-output name=version::$VERSION
56+
echo "version=$VERSION" >> $GITHUB_OUTPUT
5757
NAME=$(jq -r '.name' package.json)-$VERSION
58-
echo ::set-output name=name::$NAME
58+
echo "name=$NAME" >> $GITHUB_OUTPUT
5959
tmp=$(mktemp)
6060
jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json
6161
mkdir dist
6262
echo $VERSION > .version
6363
echo $NAME > .name
6464
- name: Use Node.js
65-
uses: actions/setup-node@v1
65+
uses: actions/setup-node@v3
6666
with:
67-
node-version: 14.x
67+
node-version: 18
6868
- run: npm install
6969
- run: npm run compile
7070
- name: npm test
71-
uses: GabrielBB/xvfb-action@v1.0
71+
uses: coactions/setup-xvfb@v1
7272
with:
7373
run: npm run test
7474
- name: Build package
7575
if: runner.os == 'Windows'
7676
run: |
7777
npx vsce package -o ${{ steps.set-version.outputs.name }}.vsix
78-
- uses: actions/upload-artifact@v2
78+
- uses: actions/upload-artifact@v3
7979
if: (runner.os == 'Windows') && (github.event_name != 'release')
8080
with:
8181
name: ${{ steps.set-version.outputs.name }}.vsix
@@ -85,44 +85,31 @@ jobs:
8585
runs-on: windows-latest
8686
needs: build
8787
steps:
88-
- uses: actions/download-artifact@v2
88+
- uses: actions/download-artifact@v3
8989
with:
9090
name: ${{ needs.build.outputs.name }}.vsix
9191
- name: Create Release
9292
id: create_release
93-
uses: actions/create-release@v1
94-
env:
95-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
93+
uses: softprops/action-gh-release@v1
9694
with:
9795
tag_name: v${{ needs.build.outputs.version }}
9896
release_name: v${{ needs.build.outputs.version }}
9997
prerelease: ${{ github.event_name != 'release' }}
100-
body: |
101-
Changes in this release
102-
${{ needs.build.outputs.changelog }}
103-
- name: Upload Release Asset
104-
id: upload-release-asset
105-
uses: actions/upload-release-asset@v1
106-
env:
107-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
108-
with:
109-
upload_url: ${{ steps.create_release.outputs.upload_url }}
110-
asset_path: ${{ needs.build.outputs.name }}.vsix
111-
asset_name: ${{ needs.build.outputs.name }}.vsix
112-
asset_content_type: application/zip
98+
token: ${{ secrets.GITHUB_TOKEN }}
99+
files: ${{ needs.build.outputs.name }}.vsix
113100
publish:
114101
needs: build
115102
if: github.event_name == 'release' && needs.build.outputs.taggedbranch == 'master'
116103
runs-on: windows-latest
117104
steps:
118-
- uses: actions/checkout@v2
105+
- uses: actions/checkout@v3
119106
with:
120107
ref: master
121108
token: ${{ secrets.TOKEN }}
122109
- name: Use Node.js
123-
uses: actions/setup-node@v1
110+
uses: actions/setup-node@v3
124111
with:
125-
node-version: 14.x
112+
node-version: 18
126113
- name: Prepare build
127114
id: set-version
128115
shell: bash
@@ -136,22 +123,19 @@ jobs:
136123
git add package.json
137124
git commit -m 'auto bump version with release'
138125
jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json
139-
jq '.enableProposedApi = false' package.json > "$tmp" && mv "$tmp" package.json
126+
jq 'del(.enableProposedApi,.enabledApiProposals)' package.json > "$tmp" && mv "$tmp" package.json
140127
npm install
141128
git push
142129
- name: Build package
143130
run: |
144131
npx vsce package -o ${{ needs.build.outputs.name }}.vsix
145132
- name: Upload Release Asset
146133
id: upload-release-asset
147-
uses: actions/upload-release-asset@v1
148-
env:
149-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
134+
uses: softprops/action-gh-release@v1
150135
with:
151-
upload_url: ${{ github.event.release.upload_url }}
152-
asset_path: ${{ needs.build.outputs.name }}.vsix
153-
asset_name: ${{ needs.build.outputs.name }}.vsix
154-
asset_content_type: application/zip
136+
tag_name: ${{ github.event.release.tag_name }}
137+
files: ${{ needs.build.outputs.name }}.vsix
138+
token: ${{ secrets.GITHUB_TOKEN }}
155139
- name: Publish to VSCode Marketplace
156140
shell: bash
157141
run: |

‎.github/workflows/prerelease.yml

Lines changed: 20 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
version: ${{ steps.set-version.outputs.version }}
2929
taggedbranch: ${{ steps.find-branch.outputs.taggedbranch }}
3030
steps:
31-
- uses: actions/checkout@v2
31+
- uses: actions/checkout@v3
3232
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
3333
- name: Find which branch the release tag points at
3434
id: find-branch
@@ -38,7 +38,7 @@ jobs:
3838
git fetch --depth=1 origin +refs/heads/*:refs/heads/*
3939
set -x
4040
TAGGEDBRANCH=$(git for-each-ref --points-at=${{github.sha}} --format='%(refname:lstrip=2)' refs/heads/)
41-
echo ::set-output name=taggedbranch::$TAGGEDBRANCH
41+
echo "taggedbranch=$TAGGEDBRANCH" >> $GITHUB_OUTPUT
4242
- name: Set an output
4343
id: set-version
4444
if: runner.os == 'Windows'
@@ -49,33 +49,33 @@ jobs:
4949
[ $GITHUB_EVENT_NAME == 'release' ] && VERSION=${{ github.event.release.tag_name }} && VERSION=${VERSION/v/}
5050
CHANGELOG=$(cat CHANGELOG.md | sed -n "/## \[${VERSION}\]/,/## /p" | sed '/^$/d;1d;$d')
5151
CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
52-
echo ::set-output name=changelog::$CHANGELOG
52+
echo "changelog=$CHANGELOG" >> $GITHUB_OUTPUT
5353
git tag -l | cat
5454
[ $GITHUB_EVENT_NAME == 'push' ] && VERSION+=-beta && VERSION+=.$(($(git tag -l "v$VERSION.*" | sort -nt. -k4 2>/dev/null | tail -1 | cut -d. -f4)+1))
5555
[ $GITHUB_EVENT_NAME == 'pull_request' ] && VERSION+=-dev.${{ github.event.pull_request.number }}
56-
echo ::set-output name=version::$VERSION
56+
echo "version=$VERSION" >> $GITHUB_OUTPUT
5757
NAME=$(jq -r '.name' package.json)-$VERSION
58-
echo ::set-output name=name::$NAME
58+
echo "name=$NAME" >> $GITHUB_OUTPUT
5959
tmp=$(mktemp)
6060
jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json
6161
mkdir dist
6262
echo $VERSION > .version
6363
echo $NAME > .name
6464
- name: Use Node.js
65-
uses: actions/setup-node@v1
65+
uses: actions/setup-node@v3
6666
with:
67-
node-version: 14.x
67+
node-version: 18
6868
- run: npm install
6969
- run: npm run compile
7070
- name: npm test
71-
uses: GabrielBB/xvfb-action@v1.0
71+
uses: coactions/setup-xvfb@v1
7272
with:
7373
run: npm run test
7474
- name: Build pre-release package
7575
if: runner.os == 'Windows'
7676
run: |
7777
npx vsce package --pre-release -o ${{ steps.set-version.outputs.name }}.vsix --githubBranch prerelease
78-
- uses: actions/upload-artifact@v2
78+
- uses: actions/upload-artifact@v3
7979
if: (runner.os == 'Windows') && (github.event_name != 'release')
8080
with:
8181
name: ${{ steps.set-version.outputs.name }}.vsix
@@ -85,46 +85,33 @@ jobs:
8585
runs-on: windows-latest
8686
needs: build
8787
steps:
88-
- uses: actions/download-artifact@v2
88+
- uses: actions/download-artifact@v3
8989
with:
9090
name: ${{ needs.build.outputs.name }}.vsix
9191
- name: Create Pre-Release
9292
id: create_release
93-
uses: actions/create-release@v1
94-
if: runner.os == 'Windows'
93+
uses: softprops/action-gh-release@v1
9594
env:
9695
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9796
with:
9897
tag_name: v${{ needs.build.outputs.version }}
9998
release_name: v${{ needs.build.outputs.version }}
10099
prerelease: ${{ github.event_name != 'release' }}
101-
body: |
102-
Changes in this pre-release
103-
${{ needs.build.outputs.changelog }}
104-
- name: Upload Pre-Release Asset
105-
id: upload-release-asset
106-
uses: actions/upload-release-asset@v1
107-
if: runner.os == 'Windows'
108-
env:
109-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
110-
with:
111-
upload_url: ${{ steps.create_release.outputs.upload_url }}
112-
asset_path: ${{ needs.build.outputs.name }}.vsix
113-
asset_name: ${{ needs.build.outputs.name }}.vsix
114-
asset_content_type: application/zip
100+
token: ${{ secrets.GITHUB_TOKEN }}
101+
files: ${{ needs.build.outputs.name }}.vsix
115102
publish:
116103
needs: build
117104
if: github.event_name == 'release' && needs.build.outputs.taggedbranch == 'prerelease'
118105
runs-on: windows-latest
119106
steps:
120-
- uses: actions/checkout@v2
107+
- uses: actions/checkout@v3
121108
with:
122109
ref: prerelease
123110
token: ${{ secrets.TOKEN }}
124111
- name: Use Node.js
125-
uses: actions/setup-node@v1
112+
uses: actions/setup-node@v3
126113
with:
127-
node-version: 14.x
114+
node-version: 18
128115
- name: Prepare pre-release build
129116
id: set-version
130117
shell: bash
@@ -146,15 +133,11 @@ jobs:
146133
npx vsce package --pre-release -o ${{ needs.build.outputs.name }}.vsix --githubBranch prerelease
147134
- name: Upload Release Asset
148135
id: upload-release-asset
149-
uses: actions/upload-release-asset@v1
150-
if: runner.os == 'Windows'
151-
env:
152-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
136+
uses: softprops/action-gh-release@v1
153137
with:
154-
upload_url: ${{ github.event.release.upload_url }}
155-
asset_path: ${{ needs.build.outputs.name }}.vsix
156-
asset_name: ${{ needs.build.outputs.name }}.vsix
157-
asset_content_type: application/zip
138+
tag_name: ${{ github.event.release.tag_name }}
139+
files: ${{ needs.build.outputs.name }}.vsix
140+
token: ${{ secrets.GITHUB_TOKEN }}
158141
- name: Publish to VSCode Marketplace
159142
shell: bash
160143
run: |

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
node_modules/
33
out/
4+
dist/
45
.vscode-test
56
*.vsix

‎.vscode/launch.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111
"--disable-extensions",
1212
"--extensionDevelopmentPath=${workspaceRoot}"
1313
],
14-
"stopOnEntry": false,
1514
"sourceMaps": true,
1615
"outFiles": [
17-
"${workspaceRoot}/out/**/*.js"
16+
"${workspaceRoot}/dist/**/*.js"
1817
],
19-
"preLaunchTask": "npm: watch"
18+
"preLaunchTask": "npm: webpack"
2019
},
2120
{
2221
"name": "Launch Extension",
@@ -26,12 +25,11 @@
2625
"args": [
2726
"--extensionDevelopmentPath=${workspaceRoot}"
2827
],
29-
"stopOnEntry": false,
3028
"sourceMaps": true,
3129
"outFiles": [
32-
"${workspaceRoot}/out/**/*.js"
30+
"${workspaceRoot}/dist/**/*.js"
3331
],
34-
"preLaunchTask": "npm: watch"
32+
"preLaunchTask": "npm: webpack"
3533
},
3634
{
3735
"name": "Extension Tests",
@@ -45,7 +43,7 @@
4543
"outFiles": [
4644
"${workspaceFolder}/out/test/**/*.js"
4745
],
48-
"preLaunchTask": "npm: compile"
46+
"preLaunchTask": "npm: test-compile"
4947
}
5048
]
5149
}

‎.vscode/tasks.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"tasks": [
1313
{
1414
"type": "npm",
15-
"script": "watch",
15+
"script": "webpack-dev",
1616
"presentation": {
17-
"reveal": "always"
17+
"reveal": "never"
1818
},
1919
"group": {
2020
"isDefault": true,

‎.vscodeignore

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
.github/**
2-
.vscode/**
3-
.vscode-test/**
4-
out/test/**
5-
**/*.ts
6-
**/*.map
7-
.gitignore
8-
**/tsconfig.json
9-
**/tslint.json
10-
**/.eslintrc.json
1+
**
2+
!dist/*.js
3+
!dist/*.txt
4+
!images/*.svg
5+
!images/*.png
6+
!CHANGELOG.md
7+
!LICENSE
8+
!README.md
9+
!package.json

‎images/InterSystems.svg

Lines changed: 25 additions & 0 deletions
Loading

‎images/toolbox.svg

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎images/toolsContainer.svg

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)