BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

master #5

Merged
BRNSystems merged 45 commits from Mirrorlandia_minetest/irrlicht:master into master 2024-02-27 13:26:18 +01:00
Conversation 0 Commits 45 Files Changed 188 +16 -16
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0069837920 - Show all commits

32
.github/workflows/build.yml vendored
View File

@ -10,7 +10,7 @@ jobs:
linux-gl: linux-gl:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get update sudo apt-get update
@ -30,7 +30,7 @@ jobs:
make DESTDIR=$PWD/_install install make DESTDIR=$PWD/_install install
tar -c -I "gzip -9" -f irrlicht-linux.tar.gz -C ./_install/usr/local . 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: with:
name: irrlicht-linux name: irrlicht-linux
path: ./irrlicht-linux.tar.gz path: ./irrlicht-linux.tar.gz
@ -39,7 +39,7 @@ jobs:
# Xvfb test is broken on 20.04 for unknown reasons (not our bug) # Xvfb test is broken on 20.04 for unknown reasons (not our bug)
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get update sudo apt-get update
@ -64,7 +64,7 @@ jobs:
# something is wrong with the SDL cmake files on 20.04 # something is wrong with the SDL cmake files on 20.04
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get update sudo apt-get update
@ -84,7 +84,7 @@ jobs:
# Xvfb test is broken on 20.04 for unknown reasons (not our bug) # Xvfb test is broken on 20.04 for unknown reasons (not our bug)
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get update sudo apt-get update
@ -109,7 +109,7 @@ jobs:
# something is wrong with the SDL cmake files on 20.04 # something is wrong with the SDL cmake files on 20.04
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install deps - name: Install deps
run: | run: |
sudo apt-get update sudo apt-get update
@ -142,7 +142,7 @@ jobs:
- {variant: win32, arch: i686, extras: "-sdl"} - {variant: win32, arch: i686, extras: "-sdl"}
- {variant: win64, arch: x86_64, extras: "-sdl"} - {variant: win64, arch: x86_64, extras: "-sdl"}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install compiler - name: Install compiler
run: | run: |
sudo apt-get update && sudo apt-get install cmake -qyy sudo apt-get update && sudo apt-get install cmake -qyy
@ -156,7 +156,7 @@ jobs:
CXX: ${{matrix.config.arch}}-w64-mingw32-clang++ CXX: ${{matrix.config.arch}}-w64-mingw32-clang++
extras: ${{matrix.config.extras}} extras: ${{matrix.config.extras}}
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4
with: with:
name: irrlicht-${{matrix.config.variant}}${{matrix.config.extras}} name: irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}
path: ./irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}.zip path: ./irrlicht-${{matrix.config.variant}}${{matrix.config.extras}}.zip
@ -164,7 +164,7 @@ jobs:
macos: macos:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install deps - name: Install deps
run: | run: |
brew update brew update
@ -182,7 +182,7 @@ jobs:
macos-sdl: macos-sdl:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install deps - name: Install deps
run: | run: |
brew update brew update
@ -223,7 +223,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Restore from cache and run vcpkg - name: Restore from cache and run vcpkg
uses: lukka/run-vcpkg@v7 uses: lukka/run-vcpkg@v7
@ -256,9 +256,9 @@ jobs:
run: move include artifact/ run: move include artifact/
- name: Upload Artifact - name: Upload Artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: msvc-${{ matrix.config.arch }} name: msvc-${{ matrix.config.arch }}-${{matrix.sdl.use}}
path: artifact/ path: artifact/
android: android:
@ -272,7 +272,7 @@ jobs:
arch: [armeabi-v7a, arm64-v8a, x86, x86_64] arch: [armeabi-v7a, arm64-v8a, x86, x86_64]
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Install deps - name: Install deps
run: | run: |
@ -282,7 +282,7 @@ jobs:
- name: Cache NDK - name: Cache NDK
id: cache-ndk id: cache-ndk
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
key: android-ndk-${{ env.ndk_version }}-linux key: android-ndk-${{ env.ndk_version }}-linux
path: ${{ env.ANDROID_NDK }} path: ${{ env.ANDROID_NDK }}
@ -299,7 +299,7 @@ jobs:
run: ./scripts/ci-build-android.sh ${{ matrix.arch }} run: ./scripts/ci-build-android.sh ${{ matrix.arch }}
#- name: Upload Artifact #- name: Upload Artifact
# uses: actions/upload-artifact@v3 # uses: actions/upload-artifact@v4
# with: # with:
# name: irrlicht-android-${{ matrix.arch }} # name: irrlicht-android-${{ matrix.arch }}
# path: ${{ runner.temp }}/pkg/${{ matrix.arch }} # path: ${{ runner.temp }}/pkg/${{ matrix.arch }}