Skip to content

Commit 63db12c

Browse files
fix: Revert GH Actions to use Ubuntu 22.04 (#2701)
* update gh actions test step to use ubuntu 22.04 instead of latest due to issues with 24.04
1 parent c7837e6 commit 63db12c

File tree

7 files changed

+20
-18
lines changed

7 files changed

+20
-18
lines changed

.github/workflows/master.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
publish:
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-22.04
1010
steps:
1111
- uses: actions/checkout@v3
1212
- uses: ./.github/workflows/setup

.github/workflows/setup/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ runs:
1919
echo "source_key=$SOURCE_KEY" >> $GITHUB_ENV
2020
2121
- name: Setup node
22-
uses: actions/setup-node@v3
22+
uses: actions/setup-node@v4
2323
with:
2424
node-version: ${{ env.node_version }}
2525
cache: npm

.github/workflows/test-pr.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/**'
77
jobs:
88
build:
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-22.04
1010
steps:
1111
- uses: actions/checkout@v3
1212
- uses: ./.github/workflows/setup
@@ -45,7 +45,7 @@ jobs:
4545
# Implementation is too outdated to test in GitHub Actions
4646
# - elm,schema-elm
4747

48-
# Language is too niche / obscure to test easily on ubuntu-latest
48+
# Language is too niche / obscure to test easily on ubuntu-22.04
4949
# - pike,schema-pike
5050

5151
# Not yet started
@@ -56,18 +56,18 @@ jobs:
5656
# Never tested?
5757
# - crystal
5858

59-
runs-on: [ubuntu-latest]
59+
runs-on: [ubuntu-22.04]
6060

6161
include:
6262
# Rust is very slow, so we use a larger runner
6363
- fixture: rust,schema-rust
64-
runs-on: ubuntu-latest-8-cores
64+
runs-on: ubuntu-latest-16-cores
6565
# Kotlin is also slow
6666
- fixture: kotlin,schema-kotlin,kotlin-jackson,schema-kotlin-jackson
67-
runs-on: ubuntu-latest-8-cores
67+
runs-on: ubuntu-latest-16-cores
6868

69-
- fixture: objective-c
70-
runs-on: macos-11
69+
# - fixture: objective-c # FIXME: temp disable obj-c in ci
70+
# runs-on: macos-latest
7171

7272
name: ${{ matrix.fixture }}
7373
steps:
@@ -190,8 +190,8 @@ jobs:
190190
test-complete:
191191
if: ${{ cancelled() || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'failure') }}
192192
needs: test
193-
runs-on: ubuntu-latest
193+
runs-on: ubuntu-22.04
194194
steps:
195-
- run: |
196-
echo "Some workflows have failed!"
197-
exit 1
195+
- run: |
196+
echo "Some workflows have failed!"
197+
exit 1

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v18.18.0
1+
v22.14.0

test/fixtures.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,9 @@ class JSONFixture extends LanguageFixture {
278278
if (this.language.compileCommand) {
279279
await execAsync(this.language.compileCommand);
280280
}
281-
if (this.language.runCommand === undefined) return 0;
281+
if (this.language.runCommand === undefined) {
282+
return 0;
283+
}
282284

283285
compareJsonFileToJson(comparisonArgs(this.language, filename, filename, additionalRendererOptions));
284286

test/fixtures/csharp-SystemTextJson/test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<TargetFramework>net6</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="System.Text.Json" Version="6.0.6" />
7+
<PackageReference Include="System.Text.Json" Version="6.0.10" />
88
</ItemGroup>
9-
</Project>
9+
</Project>

test/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ export type ComparisonRelaxations = {
215215
export type FileOrCommand = { file: string } | { command: string; env: NodeJS.ProcessEnv };
216216

217217
function fileOrCommandIsFile(foc: FileOrCommand): foc is { file: string } {
218-
return (foc as any).file !== undefined;
218+
return "file" in foc && foc.file !== undefined;
219219
}
220220

221221
export type ComparisonArgs = ComparisonRelaxations & {

0 commit comments

Comments
 (0)