Skip to content

Commit 93db97b

Browse files
committed
CI toolset bump
1 parent 5483f65 commit 93db97b

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

.github/scripts/compile.bat

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
echo off
2-
31
set PLATFORM=%1
42
set ARCH=%2
53
set BUILDMODE=%3

.github/workflows/build.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
arch: ['x86', 'x64']
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
1717
- name: Install 32 bit support
1818
run: sudo apt-get install gcc-multilib g++-multilib
1919

@@ -32,13 +32,12 @@ jobs:
3232
buildmode: ['release']
3333

3434
steps:
35-
- uses: actions/checkout@v2
35+
- uses: actions/checkout@v4
3636
- name: Build
3737
run: .github/scripts/compile.sh ${{ matrix.platform }} ${{ matrix.arch }} ${{ matrix.buildmode }}
3838
- name: Run
3939
run: .github/scripts/run_tests.sh
4040

41-
4241
build-windows:
4342
runs-on: 'windows-latest'
4443

@@ -47,14 +46,12 @@ jobs:
4746
platform: ['windows']
4847
arch: ['x86', 'x64']
4948
buildmode: ['debug', 'release']
50-
toolset: ['14.3','14.2','14.1']
5149

5250
steps:
53-
- uses: actions/checkout@v2
51+
- uses: actions/checkout@v4
5452
- uses: ilammy/msvc-dev-cmd@v1
5553
with:
5654
arch: ${{ matrix.arch }}
57-
toolset: ${{ matrix.toolset }}
5855
- name: Build
5956
run: .github/scripts/compile.bat ${{ matrix.platform }} ${{ matrix.arch }} ${{ matrix.buildmode }}
6057
- name: Run
@@ -71,17 +68,17 @@ jobs:
7168
ndkversion: [21]
7269

7370
steps:
74-
- uses: actions/checkout@v2
71+
- uses: actions/checkout@v4
7572

76-
- name: Set up JDK 1.11
73+
- name: Set up JDK 17
7774
uses: actions/setup-java@v3
7875
with:
79-
distribution: 'zulu' # See 'Supported distributions' for available options
80-
java-version: '11'
76+
distribution: 'temurin' # See 'Supported distributions' for available options
77+
java-version: '17'
8178

8279
# Sets ANDROID_HOME + ANDROID_NDK_ROOT
8380
- name: Setup Android SDK
84-
uses: android-actions/setup-android@v2
81+
uses: android-actions/setup-android@v3
8582

8683
- name: Build
8784
run: .github/scripts/compile.sh ${{ matrix.platform }} ${{ matrix.arch }} ${{ matrix.buildmode }}

0 commit comments

Comments
 (0)