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
This commit is contained in:
2
.github/workflows/master.yaml
vendored
2
.github/workflows/master.yaml
vendored
@ -6,7 +6,7 @@ on:
|
||||
|
||||
jobs:
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: ./.github/workflows/setup
|
||||
|
2
.github/workflows/setup/action.yaml
vendored
2
.github/workflows/setup/action.yaml
vendored
@ -19,7 +19,7 @@ runs:
|
||||
echo "source_key=$SOURCE_KEY" >> $GITHUB_ENV
|
||||
|
||||
- name: Setup node
|
||||
uses: actions/setup-node@v3
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: ${{ env.node_version }}
|
||||
cache: npm
|
||||
|
22
.github/workflows/test-pr.yaml
vendored
22
.github/workflows/test-pr.yaml
vendored
@ -6,7 +6,7 @@ on:
|
||||
- 'release/**'
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: ./.github/workflows/setup
|
||||
@ -45,7 +45,7 @@ jobs:
|
||||
# Implementation is too outdated to test in GitHub Actions
|
||||
# - elm,schema-elm
|
||||
|
||||
# Language is too niche / obscure to test easily on ubuntu-latest
|
||||
# Language is too niche / obscure to test easily on ubuntu-22.04
|
||||
# - pike,schema-pike
|
||||
|
||||
# Not yet started
|
||||
@ -56,18 +56,18 @@ jobs:
|
||||
# Never tested?
|
||||
# - crystal
|
||||
|
||||
runs-on: [ubuntu-latest]
|
||||
runs-on: [ubuntu-22.04]
|
||||
|
||||
include:
|
||||
# Rust is very slow, so we use a larger runner
|
||||
- fixture: rust,schema-rust
|
||||
runs-on: ubuntu-latest-8-cores
|
||||
runs-on: ubuntu-latest-16-cores
|
||||
# Kotlin is also slow
|
||||
- fixture: kotlin,schema-kotlin,kotlin-jackson,schema-kotlin-jackson
|
||||
runs-on: ubuntu-latest-8-cores
|
||||
runs-on: ubuntu-latest-16-cores
|
||||
|
||||
- fixture: objective-c
|
||||
runs-on: macos-11
|
||||
# - fixture: objective-c # FIXME: temp disable obj-c in ci
|
||||
# runs-on: macos-latest
|
||||
|
||||
name: ${{ matrix.fixture }}
|
||||
steps:
|
||||
@ -190,8 +190,8 @@ jobs:
|
||||
test-complete:
|
||||
if: ${{ cancelled() || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'failure') }}
|
||||
needs: test
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- run: |
|
||||
echo "Some workflows have failed!"
|
||||
exit 1
|
||||
- run: |
|
||||
echo "Some workflows have failed!"
|
||||
exit 1
|
||||
|
@ -278,7 +278,9 @@ class JSONFixture extends LanguageFixture {
|
||||
if (this.language.compileCommand) {
|
||||
await execAsync(this.language.compileCommand);
|
||||
}
|
||||
if (this.language.runCommand === undefined) return 0;
|
||||
if (this.language.runCommand === undefined) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
compareJsonFileToJson(comparisonArgs(this.language, filename, filename, additionalRendererOptions));
|
||||
|
||||
|
@ -4,6 +4,6 @@
|
||||
<TargetFramework>net6</TargetFramework>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Text.Json" Version="6.0.6" />
|
||||
<PackageReference Include="System.Text.Json" Version="6.0.10" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
@ -215,7 +215,7 @@ export type ComparisonRelaxations = {
|
||||
export type FileOrCommand = { file: string } | { command: string; env: NodeJS.ProcessEnv };
|
||||
|
||||
function fileOrCommandIsFile(foc: FileOrCommand): foc is { file: string } {
|
||||
return (foc as any).file !== undefined;
|
||||
return "file" in foc && foc.file !== undefined;
|
||||
}
|
||||
|
||||
export type ComparisonArgs = ComparisonRelaxations & {
|
||||
|
Reference in New Issue
Block a user