Skip to content

Commit 5898c59

Browse files
committed
CI: Update images and actions for 2026
1 parent 07153d4 commit 5898c59

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
matrix:
1919
include:
2020
- name: 🐧 Linux (GCC)
21-
os: ubuntu-20.04
21+
os: ubuntu-22.04
2222
platform: linux
23-
artifact-name: godot-cpp-linux-glibc2.31-x86_64-release
23+
artifact-name: godot-cpp-linux-glibc2.35-x86_64-release
2424
artifact-path: bin/libgodot-cpp.linux.release.64.a
2525
godot_zip: Godot_v3.5-stable_linux_server.64.zip
2626
executable: Godot_v3.5-stable_linux_server.64
@@ -29,7 +29,7 @@ jobs:
2929
- name: 🏁 Windows (x86_64, MSVC)
3030
os: windows-2022
3131
platform: windows
32-
artifact-name: godot-cpp-windows-msvc2019-x86_64-release
32+
artifact-name: godot-cpp-windows-msvc2022-x86_64-release
3333
artifact-path: bin/libgodot-cpp.windows.release.64.lib
3434
cache-name: windows-x86_64-msvc
3535

@@ -42,7 +42,7 @@ jobs:
4242
cache-name: windows-x86_64-mingw
4343

4444
- name: 🍎 macOS (universal)
45-
os: macos-13
45+
os: macos-15
4646
platform: osx
4747
artifact-name: godot-cpp-macos-universal-release
4848
artifact-path: bin/libgodot-cpp.osx.release.64.a
@@ -52,15 +52,15 @@ jobs:
5252
cache-name: macos-unversal
5353

5454
- name: 🤖 Android (arm64)
55-
os: ubuntu-20.04
55+
os: ubuntu-22.04
5656
platform: android
5757
artifact-name: godot-cpp-android-arm64-release
5858
artifact-path: bin/libgodot-cpp.android.release.arm64v8.a
5959
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME android_arch=arm64v8
6060
cache-name: android-arm64
6161

6262
- name: 🍏 iOS (arm64)
63-
os: macos-13
63+
os: macos-15
6464
platform: ios
6565
artifact-name: godot-cpp-ios-arm64-release
6666
artifact-path: bin/libgodot-cpp.ios.release.arm64.a
@@ -71,7 +71,7 @@ jobs:
7171

7272
steps:
7373
- name: Checkout
74-
uses: actions/checkout@v4
74+
uses: actions/checkout@v6
7575
with:
7676
submodules: recursive
7777

@@ -82,7 +82,7 @@ jobs:
8282
continue-on-error: true
8383

8484
- name: Set up Python (for SCons)
85-
uses: actions/setup-python@v4
85+
uses: actions/setup-python@v6
8686
with:
8787
python-version: '3.x'
8888

@@ -98,7 +98,7 @@ jobs:
9898
9999
- name: Windows dependency (MinGW)
100100
if: ${{ matrix.platform == 'windows' }}
101-
uses: egor-tensin/setup-mingw@v2
101+
uses: egor-tensin/setup-mingw@v3
102102
with:
103103
version: 12.2.0
104104

@@ -119,23 +119,23 @@ jobs:
119119
- name: Run test GDNative library
120120
if: ${{ matrix.platform == 'linux' || matrix.platform == 'osx' }}
121121
run: |
122-
curl -LO https://downloads.tuxfamily.org/godotengine/3.5/${{ matrix.godot_zip }}
122+
curl -LO https://github.com/godotengine/godot/releases/download/3.5-stable/${{ matrix.godot_zip }}
123123
unzip ${{ matrix.godot_zip }}
124124
./${{ matrix.executable }} --path test -s script.gd
125125
126126
- name: Upload artifact
127-
uses: actions/upload-artifact@v3
127+
uses: actions/upload-artifact@v6
128128
with:
129129
name: ${{ matrix.artifact-name }}
130130
path: ${{ matrix.artifact-path }}
131131
if-no-files-found: error
132132

133133
static-checks:
134134
name: 📊 Static Checks (clang-format)
135-
runs-on: ubuntu-20.04
135+
runs-on: ubuntu-22.04
136136
steps:
137137
- name: Checkout
138-
uses: actions/checkout@v4
138+
uses: actions/checkout@v6
139139
with:
140140
submodules: recursive
141141

@@ -147,9 +147,7 @@ jobs:
147147
148148
- name: Install dependencies
149149
run: |
150-
sudo apt-get install -qq dos2unix recode clang-format-11
151-
sudo update-alternatives --remove-all clang-format
152-
sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-11 100
150+
sudo apt-get install -qq dos2unix recode clang-format
153151
154152
- name: Style checks via clang-format
155153
run: |

src/core/Basis.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,8 +690,8 @@ Basis::operator Quat() const {
690690
temp[2] = ((elements[1][0] - elements[0][1]) * s);
691691
} else {
692692
int i = elements[0][0] < elements[1][1] ?
693-
(elements[1][1] < elements[2][2] ? 2 : 1) :
694-
(elements[0][0] < elements[2][2] ? 2 : 0);
693+
(elements[1][1] < elements[2][2] ? 2 : 1) :
694+
(elements[0][0] < elements[2][2] ? 2 : 0);
695695
int j = (i + 1) % 3;
696696
int k = (i + 2) % 3;
697697

0 commit comments

Comments
 (0)