Skip to content

Commit f3e32b5

Browse files
authored
Merge pull request #158 from blinemedical/update-everything
Update and fix everything
2 parents 773a464 + dfd812f commit f3e32b5

14 files changed

+77598
-57767
lines changed

.eslintrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"SharedArrayBuffer": "readonly"
1212
},
1313
"parserOptions": {
14-
"ecmaVersion": 2018
14+
"ecmaVersion": 2022
1515
},
1616
"rules": {
1717
}

.github/workflows/check-dist.yml

+51-51
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
1-
# `dist/index.js` is a special file in Actions.
2-
# When you reference an action with `uses:` in a workflow,
3-
# `index.js` is the code that will run.
4-
# For our project, we generate this file through a build process from other source files.
5-
# We need to make sure the checked-in `index.js` actually matches what we expect it to be.
6-
name: Check dist/
7-
8-
on:
9-
push:
10-
branches:
11-
- main
12-
paths-ignore:
13-
- '**.md'
14-
pull_request:
15-
paths-ignore:
16-
- '**.md'
17-
workflow_dispatch:
18-
19-
jobs:
20-
check-dist:
21-
runs-on: ubuntu-latest
22-
23-
steps:
24-
- uses: actions/checkout@v4
25-
26-
- name: Set Node.js 18.x
27-
uses: actions/setup-node@v4.0.0
28-
with:
29-
node-version: 18.x
30-
31-
- name: Install dependencies
32-
run: npm ci
33-
34-
- name: Rebuild the dist/ directory
35-
run: npm run prepare
36-
37-
- name: Compare the expected and actual dist/ directories
38-
run: |
39-
if [ "$(git diff --ignore-space-at-eol dist/ | wc -l)" -gt "0" ]; then
40-
echo "Detected uncommitted changes after build. See status below:"
41-
git diff
42-
exit 1
43-
fi
44-
id: diff
45-
46-
# If index.js was different than expected, upload the expected version as an artifact
47-
- uses: actions/upload-artifact@v3
48-
if: ${{ failure() && steps.diff.conclusion == 'failure' }}
49-
with:
50-
name: dist
51-
path: dist/
1+
# `dist/index.js` is a special file in Actions.
2+
# When you reference an action with `uses:` in a workflow,
3+
# `index.js` is the code that will run.
4+
# For our project, we generate this file through a build process from other source files.
5+
# We need to make sure the checked-in `index.js` actually matches what we expect it to be.
6+
name: Check dist/
7+
8+
on:
9+
push:
10+
branches:
11+
- main
12+
paths-ignore:
13+
- '**.md'
14+
pull_request:
15+
paths-ignore:
16+
- '**.md'
17+
workflow_dispatch:
18+
19+
jobs:
20+
check-dist:
21+
runs-on: ubuntu-latest
22+
23+
steps:
24+
- uses: actions/checkout@v4
25+
- uses: actions/setup-node@v4
26+
with:
27+
node-version: latest
28+
cache: 'npm'
29+
cache-dependency-path: package-lock.json
30+
31+
- name: Install dependencies
32+
run: npm ci
33+
34+
- name: Rebuild the dist/ directory
35+
run: npm run prepare
36+
37+
- name: Compare the expected and actual dist/ directories
38+
run: |
39+
if [ "$(git diff --ignore-space-at-eol dist/ | wc -l)" -gt "0" ]; then
40+
echo "Detected uncommitted changes after build. See status below:"
41+
git diff
42+
exit 1
43+
fi
44+
id: diff
45+
46+
# If index.js was different than expected, upload the expected version as an artifact
47+
- uses: actions/upload-artifact@v3
48+
if: ${{ failure() && steps.diff.conclusion == 'failure' }}
49+
with:
50+
name: dist
51+
path: dist/

.github/workflows/test.yml

+43-43
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
name: "units-test"
2-
on:
3-
pull_request:
4-
push:
5-
branches:
6-
- main
7-
8-
jobs:
9-
# unit tests
10-
units:
11-
runs-on: ${{ matrix.os }}
12-
strategy:
13-
matrix:
14-
os: ['windows-2019', 'windows-2022', 'macos-12', 'ubuntu-20.04']
15-
steps:
16-
- uses: actions/checkout@v4
17-
- run: npm ci
18-
- run: npm test
19-
20-
# test action works running from the graph
21-
test:
22-
runs-on: ${{ matrix.os }}
23-
strategy:
24-
matrix:
25-
os: ['windows-2019', 'windows-2022', 'macos-12', 'ubuntu-20.04']
26-
arch: ['x86', 'x86_64']
27-
exclude:
28-
- os: 'macos-12'
29-
arch: 'x86'
30-
- os: 'ubuntu-20.04'
31-
arch: 'x86'
32-
33-
steps:
34-
- uses: actions/checkout@v4
35-
36-
- name: Setup GStreamer with default version
37-
uses: ./
38-
with:
39-
arch: ${{ matrix.arch }}
40-
41-
- name: Run gst-inspect --version
42-
run: |
43-
gst-inspect-1.0 --version
1+
name: "units-test"
2+
on:
3+
pull_request:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
# unit tests
10+
units:
11+
runs-on: ${{ matrix.os }}
12+
strategy:
13+
matrix:
14+
os: ['windows-2019', 'windows-2022', 'macos-12', 'ubuntu-20.04']
15+
steps:
16+
- uses: actions/checkout@v4
17+
- run: npm ci
18+
- run: npm test
19+
20+
# test action works running from the graph
21+
test:
22+
runs-on: ${{ matrix.os }}
23+
strategy:
24+
matrix:
25+
os: ['windows-2019', 'windows-2022', 'macos-12', 'ubuntu-20.04']
26+
arch: ['x86', 'x86_64']
27+
exclude:
28+
- os: 'macos-12'
29+
arch: 'x86'
30+
- os: 'ubuntu-20.04'
31+
arch: 'x86'
32+
33+
steps:
34+
- uses: actions/checkout@v4
35+
36+
- name: Setup GStreamer with default version
37+
uses: ./
38+
with:
39+
arch: ${{ matrix.arch }}
40+
41+
- name: Run gst-inspect --version
42+
run: |
43+
gst-inspect-1.0 --version

.nvmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Tested runner environments are macOS, Windows, and Ubuntu 20.04.
1212

1313
### `version`
1414

15-
The version of GStreamer to install. The default is `1.22.0`
15+
The version of GStreamer to install. The default is `1.22.7`
1616

1717
### `arch`
1818

@@ -56,4 +56,3 @@ See the `.github/workflows/test.yml` for other examples.
5656
**References:**
5757
* [Custom Actions](https://docs.github.com/en/actions/creating-actions/about-custom-actions)
5858
* [Action Toolkit](https://github.com/actions/toolkit)
59-

action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ inputs:
88
version:
99
description: 'version number'
1010
required: false
11-
default: '1.22.0'
11+
default: '1.22.7'
1212
arch:
1313
description: 'architecture (x86, x86_64)'
1414
required: false

0 commit comments

Comments
 (0)