Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

Commit

Permalink
Upgrade CI actions (#290)
Browse files Browse the repository at this point in the history
* update ci package versions to resolve warnings
* fix bug with duplicate package names under msvc
  • Loading branch information
wsor4035 authored Feb 17, 2024
1 parent ad96fab commit 0069837
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
linux-gl:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install deps
run: |
sudo apt-get update
Expand All @@ -30,7 +30,7 @@ jobs:
make DESTDIR=$PWD/_install install
tar -c -I "gzip -9" -f irrlicht-linux.tar.gz -C ./_install/usr/local .
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: irrlicht-linux
path: ./irrlicht-linux.tar.gz
Expand All @@ -39,7 +39,7 @@ jobs:
# Xvfb test is broken on 20.04 for unknown reasons (not our bug)
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install deps
run: |
sudo apt-get update
Expand All @@ -64,7 +64,7 @@ jobs:
# something is wrong with the SDL cmake files on 20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install deps
run: |
sudo apt-get update
Expand All @@ -84,7 +84,7 @@ jobs:
# Xvfb test is broken on 20.04 for unknown reasons (not our bug)
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install deps
run: |
sudo apt-get update
Expand All @@ -109,7 +109,7 @@ jobs:
# something is wrong with the SDL cmake files on 20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install deps
run: |
sudo apt-get update
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
- {variant: win32, arch: i686, extras: "-sdl"}
- {variant: win64, arch: x86_64, extras: "-sdl"}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install compiler
run: |
sudo apt-get update && sudo apt-get install cmake -qyy
Expand All @@ -156,15 +156,15 @@ jobs:
CXX: ${{matrix.config.arch}}-w64-mingw32-clang++
extras: ${{matrix.config.extras}}

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}
path: ./irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}.zip

macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install deps
run: |
brew update
Expand All @@ -182,7 +182,7 @@ jobs:
macos-sdl:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install deps
run: |
brew update
Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:

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

- name: Restore from cache and run vcpkg
uses: lukka/run-vcpkg@v7
Expand Down Expand Up @@ -256,9 +256,9 @@ jobs:
run: move include artifact/

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: msvc-${{ matrix.config.arch }}
name: msvc-${{ matrix.config.arch }}-${{matrix.sdl.use}}
path: artifact/

android:
Expand All @@ -272,7 +272,7 @@ jobs:
arch: [armeabi-v7a, arm64-v8a, x86, x86_64]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install deps
run: |
Expand All @@ -282,7 +282,7 @@ jobs:
- name: Cache NDK
id: cache-ndk
uses: actions/cache@v3
uses: actions/cache@v4
with:
key: android-ndk-${{ env.ndk_version }}-linux
path: ${{ env.ANDROID_NDK }}
Expand All @@ -299,7 +299,7 @@ jobs:
run: ./scripts/ci-build-android.sh ${{ matrix.arch }}

#- name: Upload Artifact
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: irrlicht-android-${{ matrix.arch }}
# path: ${{ runner.temp }}/pkg/${{ matrix.arch }}

0 comments on commit 0069837

Please sign in to comment.