Skip to content

Commit

Permalink
Update GitHub checkout action version
Browse files Browse the repository at this point in the history
- Update GitHub Actions runner images for Linux and macOS
- Fix GitHub Actions compilation on MinGW
  • Loading branch information
encelo committed Feb 29, 2024
1 parent 3355cbf commit 09386ce
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/emscripten.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
matrix:
BuildType: [Debug, Release]

runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'

steps:
- name: 'Checkout code'
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: 'Install Emscripten SDK'
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ jobs:
CC: clang
CXX: clang++

runs-on: 'ubuntu-20.04'
runs-on: 'ubuntu-22.04'

steps:
- name: 'Checkout code'
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: 'Install Build Dependencies'
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
fail-fast: false
matrix:
BuildType: [Debug, Release]
runs-on: 'macOS-11'
runs-on: 'macOS-12'

steps:
- name: 'Checkout code'
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: 'CMake Configuration'
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

steps:
- name: 'Checkout code'
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: 'Update MSYS2 on Windows'
run: |
Expand All @@ -49,7 +49,7 @@ jobs:
run: |
$env:MSYSTEM = "MINGW64"
C:\msys64\usr\bin\bash.exe -lc 'pacman --needed --noconfirm -S cmake'
C:\msys64\usr\bin\bash.exe -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-cmake'
if ("${{ matrix.CC }}" -eq "gcc") { C:\msys64\usr\bin\bash.exe -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-gcc' }
else { C:\msys64\usr\bin\bash.exe -lc 'pacman --needed --noconfirm -S mingw-w64-x86_64-clang' }
Expand All @@ -64,7 +64,7 @@ jobs:
$env:CXX= "${{ matrix.CXX }}"
$env:MSYSTEM = "MINGW64"
C:\msys64\usr\bin\bash.exe -lc 'cmake -G \"MSYS Makefiles\" -B ../nCine-libraries-build -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }}'
C:\msys64\usr\bin\bash.exe -lc "cmake -G 'MSYS Makefiles' -B ../nCine-libraries-build -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }}"
- name: 'Make'
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: 'Checkout code'
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: 'CMake Configuration'
run: |
Expand Down

0 comments on commit 09386ce

Please sign in to comment.