Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into vko_update_transl…
Browse files Browse the repository at this point in the history
…ations
  • Loading branch information
AenBleidd committed Dec 12, 2022
2 parents 1dfaf6c + d0580d8 commit e315d35
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:
jobs:
build:
name: ${{ matrix.type }}-build
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
matrix:
type: [manager, libs, apps, manager-vcpkg, libs-vcpkg, apps-vcpkg, libs-cmake]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:
jobs:
build:
name: ${{ matrix.type }}-build
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
matrix:
type: [libs, client, apps, libs-vcpkg, client-vcpkg, apps-vcpkg, libs-cmake, libs-arm64, apps-arm64, manager-with-webview-vcpkg, server, manager-with-webview, manager-without-webview, unit-test, integration-test]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:
jobs:
build:
name: ${{ matrix.type }}-build
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
matrix:
type: [libs-mingw, apps-mingw, apps-mingw-vcpkg, libs-mingw-cmake]
Expand Down

0 comments on commit e315d35

Please sign in to comment.