Skip to content

Commit

Permalink
[CI] Bump checkout version to master + Use Java 17 for Android
Browse files Browse the repository at this point in the history
* Bumping the checkout version to master makes the warning about NodeJS disappear, on GitHub Actions.
* Gradle 8.9 needs Java 17 in order to run, it no longer supports Java 11.
  • Loading branch information
mickbot-92 authored Jul 26, 2024
1 parent 63fdb59 commit 23de6c9
Showing 1 changed file with 16 additions and 11 deletions.
27 changes: 16 additions & 11 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fxcg:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@master
with:
submodules: 'recursive'
- name: Install dependencies
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
runs-on: ubuntu-latest
container: devkitpro/devkitarm:latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@master
with:
submodules: true
- run: sudo apt-get update
Expand All @@ -105,9 +105,14 @@ jobs:
android:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@master
with:
submodules: 'recursive'
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
- run: wget -nv https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip
- run: unzip -q android-ndk-r21e-linux-x86_64.zip
- run: make -j2 PLATFORM=simulator TARGET=android NDK_PATH=./android-ndk-r21e
Expand All @@ -132,7 +137,7 @@ jobs:
steps:
- run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
- uses: numworks/setup-arm-toolchain@2020-q2
- uses: actions/checkout@v2
- uses: actions/checkout@master
with:
submodules: 'recursive'
- run: mkdir final-output
Expand Down Expand Up @@ -185,7 +190,7 @@ jobs:
steps:
- run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
- uses: numworks/setup-arm-toolchain@2020-q2
- uses: actions/checkout@v2
- uses: actions/checkout@master
with:
submodules: 'recursive'
- run: make -j2 MODEL=n0110 epsilon.dfu
Expand Down Expand Up @@ -220,7 +225,7 @@ jobs:
steps:
- run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
- uses: numworks/setup-arm-toolchain@2022-08
- uses: actions/checkout@v2
- uses: actions/checkout@master
with:
submodules: 'recursive'
- run: make -j2 MODEL=n0110 bootloader
Expand Down Expand Up @@ -260,7 +265,7 @@ jobs:
shell: msys2 {0}
steps:
- uses: msys2/setup-msys2@v2
- uses: actions/checkout@v2
- uses: actions/checkout@master
with:
submodules: 'recursive'
- run: pacman -S --noconfirm mingw-w64-x86_64-gcc mingw-w64-x86_64-freetype mingw-w64-x86_64-pkg-config make mingw-w64-x86_64-python3 mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libpng
Expand Down Expand Up @@ -289,7 +294,7 @@ jobs:
- uses: numworks/setup-emscripten@master
with:
sdk: latest
- uses: actions/checkout@v2
- uses: actions/checkout@master
with:
submodules: 'recursive'
- run: make -j2 PLATFORM=simulator TARGET=web
Expand All @@ -315,7 +320,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
- uses: actions/checkout@v2
- uses: actions/checkout@master
with:
submodules: 'recursive'
- run: make -j2 PLATFORM=simulator
Expand All @@ -342,7 +347,7 @@ jobs:
runs-on: macOS-latest
steps:
- run: brew install numworks/tap/epsilon-sdk
- uses: actions/checkout@v2
- uses: actions/checkout@master
with:
submodules: 'recursive'
- run: make -j2 PLATFORM=simulator
Expand All @@ -357,7 +362,7 @@ jobs:
runs-on: macOS-latest
steps:
- run: brew install numworks/tap/epsilon-sdk
- uses: actions/checkout@v2
- uses: actions/checkout@master
with:
submodules: 'recursive'
- run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0
Expand Down

0 comments on commit 23de6c9

Please sign in to comment.