Skip to content

Commit d8d8ae7

Browse files
committed
CI: Update images and actions for 2026
(cherry picked from commit 5898c59)
1 parent 5b340cb commit d8d8ae7

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ jobs:
1010
matrix:
1111
include:
1212
- name: 🐧 Linux (GCC)
13-
os: ubuntu-20.04
13+
os: ubuntu-22.04
1414
platform: linux
15-
artifact-name: godot-cpp-linux-glibc2.31-x86_64-release
15+
artifact-name: godot-cpp-linux-glibc2.35-x86_64-release
1616
artifact-path: bin/libgodot-cpp.linux.release.64.a
1717
godot_zip: Godot_v3.5-stable_linux_server.64.zip
1818
executable: Godot_v3.5-stable_linux_server.64
1919

2020
- name: 🏁 Windows (x86_64, MSVC)
2121
os: windows-2022
2222
platform: windows
23-
artifact-name: godot-cpp-windows-msvc2019-x86_64-release
23+
artifact-name: godot-cpp-windows-msvc2022-x86_64-release
2424
artifact-path: bin/libgodot-cpp.windows.release.64.lib
2525

2626
- name: 🏁 Windows (x86_64, MinGW)
@@ -31,7 +31,7 @@ jobs:
3131
flags: use_mingw=yes
3232

3333
- name: 🍎 macOS (universal)
34-
os: macos-13
34+
os: macos-15
3535
platform: osx
3636
artifact-name: godot-cpp-macos-universal-release
3737
artifact-path: bin/libgodot-cpp.osx.release.64.a
@@ -40,26 +40,26 @@ jobs:
4040
executable: Godot.app/Contents/MacOS/Godot
4141

4242
- name: 🤖 Android (arm64)
43-
os: ubuntu-20.04
43+
os: ubuntu-22.04
4444
platform: android
4545
artifact-name: godot-cpp-android-arm64-release
4646
artifact-path: bin/libgodot-cpp.android.release.arm64v8.a
4747
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME android_arch=arm64v8
4848

4949
- name: 🍏 iOS (arm64)
50-
os: macos-13
50+
os: macos-15
5151
platform: ios
5252
artifact-name: godot-cpp-ios-arm64-release
5353
artifact-path: bin/libgodot-cpp.ios.release.arm64.a
5454

5555
steps:
5656
- name: Checkout
57-
uses: actions/checkout@v4
57+
uses: actions/checkout@v6
5858
with:
5959
submodules: recursive
6060

6161
- name: Set up Python (for SCons)
62-
uses: actions/setup-python@v4
62+
uses: actions/setup-python@v6
6363
with:
6464
python-version: '3.x'
6565

@@ -75,7 +75,7 @@ jobs:
7575
7676
- name: Windows dependency (MinGW)
7777
if: ${{ matrix.platform == 'windows' }}
78-
uses: egor-tensin/setup-mingw@v2
78+
uses: egor-tensin/setup-mingw@v3
7979
with:
8080
version: 12.2.0
8181

@@ -96,23 +96,25 @@ jobs:
9696
- name: Run test GDNative library
9797
if: ${{ matrix.platform == 'linux' || matrix.platform == 'osx' }}
9898
run: |
99-
curl -LO https://downloads.tuxfamily.org/godotengine/3.5/${{ matrix.godot_zip }}
99+
curl -LO https://github.com/godotengine/godot/releases/download/3.5-stable/${{ matrix.godot_zip }}
100100
unzip ${{ matrix.godot_zip }}
101101
./${{ matrix.executable }} --path test -s script.gd
102102
103103
- name: Upload artifact
104-
uses: actions/upload-artifact@v3
104+
uses: actions/upload-artifact@v6
105105
with:
106106
name: ${{ matrix.artifact-name }}
107107
path: ${{ matrix.artifact-path }}
108108
if-no-files-found: error
109109

110110
static-checks:
111111
name: 📊 Static Checks (clang-format)
112-
runs-on: ubuntu-20.04
112+
runs-on: ubuntu-22.04
113113
steps:
114114
- name: Checkout
115-
uses: actions/checkout@v4
115+
uses: actions/checkout@v6
116+
with:
117+
submodules: recursive
116118

117119
- name: Make apt sources.list use the default Ubuntu repositories
118120
run: |
@@ -122,9 +124,7 @@ jobs:
122124
123125
- name: Install dependencies
124126
run: |
125-
sudo apt-get install -qq dos2unix recode clang-format-11
126-
sudo update-alternatives --remove-all clang-format
127-
sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-11 100
127+
sudo apt-get install -qq dos2unix recode clang-format
128128
129129
- name: Style checks via clang-format
130130
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)