diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13f8851e..91d6ce51 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,9 +18,9 @@ jobs: matrix: include: - name: 🐧 Linux (GCC) - os: ubuntu-20.04 + os: ubuntu-22.04 platform: linux - artifact-name: godot-cpp-linux-glibc2.31-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 @@ -29,7 +29,7 @@ jobs: - name: 🏁 Windows (x86_64, MSVC) 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 cache-name: windows-x86_64-msvc @@ -42,7 +42,7 @@ jobs: cache-name: windows-x86_64-mingw - name: 🍎 macOS (universal) - os: macos-13 + os: macos-15 platform: osx artifact-name: godot-cpp-macos-universal-release artifact-path: bin/libgodot-cpp.osx.release.64.a @@ -52,7 +52,7 @@ jobs: cache-name: macos-unversal - name: 🤖 Android (arm64) - os: ubuntu-20.04 + os: ubuntu-22.04 platform: android artifact-name: godot-cpp-android-arm64-release artifact-path: bin/libgodot-cpp.android.release.arm64v8.a @@ -60,7 +60,7 @@ jobs: cache-name: android-arm64 - name: 🍏 iOS (arm64) - os: macos-13 + os: macos-15 platform: ios artifact-name: godot-cpp-ios-arm64-release artifact-path: bin/libgodot-cpp.ios.release.arm64.a @@ -71,7 +71,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: submodules: recursive @@ -82,7 +82,7 @@ jobs: continue-on-error: true - name: Set up Python (for SCons) - uses: actions/setup-python@v4 + uses: actions/setup-python@v6 with: python-version: '3.x' @@ -98,7 +98,7 @@ 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 @@ -119,12 +119,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 }} @@ -132,10 +132,10 @@ jobs: static-checks: name: 📊 Static Checks (clang-format) - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: submodules: recursive @@ -147,9 +147,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: | diff --git a/src/core/Basis.cpp b/src/core/Basis.cpp index 6bae9d9f..e1765308 100644 --- a/src/core/Basis.cpp +++ b/src/core/Basis.cpp @@ -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;