Skip to content

Commit 3c0ab3d

Browse files
authored
Merge pull request #31 from novnc/master
latest changes from origin
2 parents 2192df9 + fc5b83c commit 3c0ab3d

12 files changed

Lines changed: 518 additions & 163 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ jobs:
1313
id-token: write
1414
contents: read
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
1717
- run: |
1818
GITREV=$(git rev-parse --short HEAD)
1919
echo $GITREV
2020
sed -i "s/^\(.*\"version\".*\)\"\([^\"]\+\)\"\(.*\)\$/\1\"\2-g$GITREV\"\3/" package.json
2121
if: github.event_name != 'release'
22-
- uses: actions/setup-node@v4
22+
- uses: actions/setup-node@v6
2323
with:
2424
# Node 24 is needed to get npm > 11.5.1, which is a requirement for
2525
# OIDC auth.
2626
node-version: 24
2727
# Needs to be explicitly specified for auth to work
2828
registry-url: 'https://registry.npmjs.org'
2929
- run: npm install
30-
- uses: actions/upload-artifact@v4
30+
- uses: actions/upload-artifact@v7
3131
with:
3232
name: npm
3333
path: lib
@@ -49,7 +49,7 @@ jobs:
4949
snap:
5050
runs-on: ubuntu-latest
5151
steps:
52-
- uses: actions/checkout@v4
52+
- uses: actions/checkout@v6
5353
- run: |
5454
GITREV=$(git rev-parse --short HEAD)
5555
echo $GITREV
@@ -61,7 +61,7 @@ jobs:
6161
sed -i "s/^version:.*/version: '$VERSION'/" snap/snapcraft.yaml
6262
- uses: snapcore/action-build@v1
6363
id: snapcraft
64-
- uses: actions/upload-artifact@v4
64+
- uses: actions/upload-artifact@v7
6565
with:
6666
name: snap
6767
path: ${{ steps.snapcraft.outputs.snap }}

.github/workflows/lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ jobs:
66
eslint:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
10-
- uses: actions/setup-node@v4
9+
- uses: actions/checkout@v6
10+
- uses: actions/setup-node@v6
1111
- run: npm update
1212
- run: npm run lint
1313
html:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v4
17-
- uses: actions/setup-node@v4
16+
- uses: actions/checkout@v6
17+
- uses: actions/setup-node@v6
1818
- run: npm update
1919
- run: git ls-tree --name-only -r HEAD | grep -E "[.](html|css)$" | xargs ./utils/validate

.github/workflows/test.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,18 @@ jobs:
1313
- ChromeHeadless
1414
- FirefoxHeadless
1515
include:
16-
- os: macos-latest
16+
# FIXME: We'd like to use "macos-latest", but Safari tests
17+
# are flaky on it and timeout often. As of 2026-05-23
18+
# macos-latest is still on 10.15.
19+
- os: macos-26
1720
browser: Safari
1821
- os: windows-latest
1922
browser: EdgeHeadless
2023
fail-fast: false
2124
runs-on: ${{ matrix.os }}
2225
steps:
23-
- uses: actions/checkout@v4
24-
- uses: actions/setup-node@v4
26+
- uses: actions/checkout@v6
27+
- uses: actions/setup-node@v6
2528
- run: npm update
2629
- run: npm run test
2730
env:

.github/workflows/translate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ jobs:
66
translate:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
10-
- uses: actions/setup-node@v4
9+
- uses: actions/checkout@v6
10+
- uses: actions/setup-node@v6
1111
- run: npm update
1212
- run: sudo apt-get install gettext
1313
- run: make -C po update-pot
Lines changed: 98 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)