Skip to content

Commit cf406b3

Browse files
Merge pull request #1 from gjsjohnmurray/harlequin-clam
Test CI
2 parents 5518e32 + 704dd5a commit cf406b3

File tree

4 files changed

+10
-15
lines changed

4 files changed

+10
-15
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ on:
1919
jobs:
2020
build:
2121
timeout-minutes: 10
22-
runs-on: ${{ matrix.os }}
23-
strategy:
24-
matrix:
25-
os: [windows-latest]
22+
runs-on: ubuntu-latest
2623
outputs:
2724
name: ${{ steps.set-version.outputs.name }}
2825
version: ${{ steps.set-version.outputs.version }}
@@ -32,7 +29,7 @@ jobs:
3229
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
3330
- name: Find which branch the release tag points at
3431
id: find-branch
35-
if: github.event_name == 'release' && runner.os == 'Windows'
32+
if: github.event_name == 'release'
3633
shell: bash
3734
run: |
3835
git fetch --depth=1 origin +refs/heads/*:refs/heads/*
@@ -41,7 +38,6 @@ jobs:
4138
echo "taggedbranch=$TAGGEDBRANCH" >> $GITHUB_OUTPUT
4239
- name: Set an output
4340
id: set-version
44-
if: runner.os == 'Windows'
4541
shell: bash
4642
run: |
4743
set -x
@@ -67,16 +63,11 @@ jobs:
6763
node-version: 20
6864
- run: npm install
6965
- run: npm run compile
70-
- name: npm test
71-
uses: coactions/setup-xvfb@v1
72-
with:
73-
run: npm run test
7466
- name: Build package
75-
if: runner.os == 'Windows'
7667
run: |
7768
npx vsce package -o ${{ steps.set-version.outputs.name }}.vsix
7869
- uses: actions/upload-artifact@v4.4.2
79-
if: (runner.os == 'Windows') && (github.event_name != 'release')
70+
if: (github.event_name != 'release')
8071
with:
8172
name: ${{ steps.set-version.outputs.name }}.vsix
8273
path: ${{ steps.set-version.outputs.name }}.vsix

.vscode/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@
44
"editor.formatOnSave": true
55
},
66
"typescript.preferences.quoteStyle": "double",
7+
"git.branchProtection": [
8+
"main"
9+
],
10+
"git.branchProtectionPrompt": "alwaysCommitToNewBranch",
711
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# InterSystems View Container
22

3-
InterSystems view Container is a Visual Studio Code extension that contributes an icon to the Activity Bar and an associated view container to the Primary Side Bar. This container then hosts views contributed by the ObjectScript extension, Server Manager, and potentially others.
3+
InterSystems View Container is a Visual Studio Code extension that contributes an icon to the Activity Bar and an associated view container to the Primary Side Bar. This container then hosts views contributed by the ObjectScript extension, Server Manager, and potentially others.
44

55
See the [CHANGELOG](https://marketplace.visualstudio.com/items/intersystems-community.viewcontainer/changelog) for changes in each release.
66

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)