From c1073b4cec0d4f6e7f9f589bc1393cf18a212b90 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Mon, 18 Nov 2024 01:57:25 +0100 Subject: [PATCH] ubuntu2404 --- .github/actions/setup-mingw-ubuntu/action.yml | 12 ++++++------ .github/workflows/windows.yml | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/actions/setup-mingw-ubuntu/action.yml b/.github/actions/setup-mingw-ubuntu/action.yml index c893834..b84c51f 100644 --- a/.github/actions/setup-mingw-ubuntu/action.yml +++ b/.github/actions/setup-mingw-ubuntu/action.yml @@ -11,17 +11,17 @@ runs: if: inputs.arch == 'x86_64' shell: bash run: | - sudo apt-get install gcc-mingw-w64 g++-mingw-w64-x86-64 - sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix - sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix + sudo apt-get install g++-mingw-w64-x86-64-posix + # sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix + # sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix - name: Set up MinGW for x86_32 if: inputs.arch == 'x86_32' shell: bash run: | - sudo apt-get install gcc-mingw-w64 g++-mingw-w64-i686 - sudo update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix - sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix + sudo apt-get install g++-mingw-w64-i686-posix + # sudo update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix + # sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix - name: Set up LLVM MinGW for arm64 if: inputs.arch == 'arm64' diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9476069..4fd419c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -40,7 +40,7 @@ env: jobs: windows-builds: - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-24.04" name: ${{ matrix.opts.name }} strategy: fail-fast: false @@ -221,10 +221,10 @@ jobs: with: path: ${{github.workspace}}/.scons_cache/ key: ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}} - restore-keys: | - ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}} - ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}} - ${{env.BIN}}-${{inputs.godot-ref}} + # restore-keys: | + # ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}} + # ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}} + # ${{env.BIN}}-${{inputs.godot-ref}} - name: Compilation env: