Compare commits

...

7 Commits

Author SHA1 Message Date
Rémi Verschelde
d8d8ae7953 CI: Update images and actions for 2026
(cherry picked from commit 5898c591e0)
2026-01-08 14:22:49 +01:00
Rémi Verschelde
5b340cb483 CI: Fix MinGW install error by pinning to earlier version
Works around https://github.com/egor-tensin/setup-mingw/issues/14.

(cherry picked from commit 0369f6fea0)
2023-10-04 15:21:23 +02:00
Rémi Verschelde
4212e9e38b CI: Update all images and actions
(cherry picked from commit 5f401ad88a)
2023-09-26 23:01:33 +02:00
Aaron Franke
745d7a2d1a Bump Ubuntu version on CI from 18.04 to 20.04
(cherry picked from commit 102e3c8d16)
2023-09-26 23:01:16 +02:00
Rémi Verschelde
ef26a3b42d headers: Sync with upstream 3.5 commit 6c814135b (3.5.3-stable) 2023-09-25 15:51:54 +02:00
Rémi Verschelde
76d6ad5d8d headers: Sync with upstream 3.5 commit 338114d47 (3.5.2-stable) 2023-03-07 09:38:59 +01:00
Rémi Verschelde
316b91c5f5 headers: Sync with upstream 3.5 commit 63d04316d (3.5.1-stable) 2022-09-28 00:01:34 +02:00
3 changed files with 23 additions and 21 deletions

View File

@@ -10,28 +10,28 @@ jobs:
matrix:
include:
- name: 🐧 Linux (GCC)
os: ubuntu-18.04
os: ubuntu-22.04
platform: linux
artifact-name: godot-cpp-linux-glibc2.27-x86_64-release
artifact-name: godot-cpp-linux-glibc2.35-x86_64-release
artifact-path: bin/libgodot-cpp.linux.release.64.a
godot_zip: Godot_v3.5-stable_linux_server.64.zip
executable: Godot_v3.5-stable_linux_server.64
- name: 🏁 Windows (x86_64, MSVC)
os: windows-2019
os: windows-2022
platform: windows
artifact-name: godot-cpp-windows-msvc2019-x86_64-release
artifact-name: godot-cpp-windows-msvc2022-x86_64-release
artifact-path: bin/libgodot-cpp.windows.release.64.lib
- name: 🏁 Windows (x86_64, MinGW)
os: windows-2019
os: windows-2022
platform: windows
artifact-name: godot-cpp-linux-mingw-x86_64-release
artifact-path: bin/libgodot-cpp.windows.release.64.a
flags: use_mingw=yes
- name: 🍎 macOS (universal)
os: macos-11
os: macos-15
platform: osx
artifact-name: godot-cpp-macos-universal-release
artifact-path: bin/libgodot-cpp.osx.release.64.a
@@ -40,26 +40,26 @@ jobs:
executable: Godot.app/Contents/MacOS/Godot
- name: 🤖 Android (arm64)
os: ubuntu-18.04
os: ubuntu-22.04
platform: android
artifact-name: godot-cpp-android-arm64-release
artifact-path: bin/libgodot-cpp.android.release.arm64v8.a
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME android_arch=arm64v8
- name: 🍏 iOS (arm64)
os: macos-11
os: macos-15
platform: ios
artifact-name: godot-cpp-ios-arm64-release
artifact-path: bin/libgodot-cpp.ios.release.arm64.a
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v6
with:
submodules: recursive
- name: Set up Python (for SCons)
uses: actions/setup-python@v4
uses: actions/setup-python@v6
with:
python-version: '3.x'
@@ -75,7 +75,9 @@ jobs:
- name: Windows dependency (MinGW)
if: ${{ matrix.platform == 'windows' }}
uses: egor-tensin/setup-mingw@v2
uses: egor-tensin/setup-mingw@v3
with:
version: 12.2.0
- name: Build godot-cpp (debug)
run: |
@@ -94,12 +96,12 @@ jobs:
- name: Run test GDNative library
if: ${{ matrix.platform == 'linux' || matrix.platform == 'osx' }}
run: |
curl -LO https://downloads.tuxfamily.org/godotengine/3.5/${{ matrix.godot_zip }}
curl -LO https://github.com/godotengine/godot/releases/download/3.5-stable/${{ matrix.godot_zip }}
unzip ${{ matrix.godot_zip }}
./${{ matrix.executable }} --path test -s script.gd
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v6
with:
name: ${{ matrix.artifact-name }}
path: ${{ matrix.artifact-path }}
@@ -107,10 +109,12 @@ jobs:
static-checks:
name: 📊 Static Checks (clang-format)
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v6
with:
submodules: recursive
- name: Make apt sources.list use the default Ubuntu repositories
run: |
@@ -120,9 +124,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get install -qq dos2unix recode clang-format-11
sudo update-alternatives --remove-all clang-format
sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-11 100
sudo apt-get install -qq dos2unix recode clang-format
- name: Style checks via clang-format
run: |

View File

@@ -690,8 +690,8 @@ Basis::operator Quat() const {
temp[2] = ((elements[1][0] - elements[0][1]) * s);
} else {
int i = elements[0][0] < elements[1][1] ?
(elements[1][1] < elements[2][2] ? 2 : 1) :
(elements[0][0] < elements[2][2] ? 2 : 0);
(elements[1][1] < elements[2][2] ? 2 : 1) :
(elements[0][0] < elements[2][2] ? 2 : 0);
int j = (i + 1) % 3;
int k = (i + 2) % 3;