From f163166bc59d2e07e0ebc9012f63fee63e02d79d Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Sun, 26 May 2024 09:40:03 +0200 Subject: [PATCH] GHA: Inline toolchain setup --- .github/workflows/gdextension.yml | 27 +++++++++++++------------- .github/workflows/linux.yml | 32 +++++++++++++++++++++++++++---- .github/workflows/test_builds.yml | 16 ++++++++++++---- 3 files changed, 54 insertions(+), 21 deletions(-) diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml index 297181d..adf6f06 100644 --- a/.github/workflows/gdextension.yml +++ b/.github/workflows/gdextension.yml @@ -133,19 +133,20 @@ jobs: id: output-name-prefix run: echo "name-prefix=${NAME_PREFIX}" >> $GITHUB_OUTPUT - # - name: Setup Linux toolchain - # if: matrix.opts.platform == 'linux' - # uses: ./limboai/.github/actions/setup-linux-toolchain - # with: - # arch: ${{matrix.opts.arch}} - - - name: Use cached buildroot - id: cache-buildroot - uses: actions/cache@v4 - with: - path: buildroot - key: 16c8302fcb676c1f0fb9df73d6cff250ba1f4286 - fail-on-cache-miss: true + - name: Set up buildroot + if: matrix.opts.platform == 'linux' && matrix.opts.arch == 'x86_64' + shell: bash + run: | + mkdir buildroot + wget https://github.com/godotengine/buildroot/releases/download/godot-2020.11.x-2/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2 -O buildroot/buildroot.tar.bz2 + cd buildroot + echo "16c8302fcb676c1f0fb9df73d6cff250ba1f4286 buildroot.tar.bz2" + echo "16c8302fcb676c1f0fb9df73d6cff250ba1f4286 buildroot.tar.bz2" | shasum --check + tar -xjf buildroot.tar.bz2 --strip-components=1 + ls -l + rm buildroot.tar.bz2 + ./relocate-sdk.sh + cd .. - name: Set up Python 3.x if: matrix.opts.platform == 'windows' || matrix.opts.platform == 'macos' diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index bdfbfa3..d11a6d3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -139,10 +139,34 @@ jobs: # Inits GODOT_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables. - uses: ./modules/limboai/.github/actions/init-version - - name: Set up Linux toolchain - uses: ./modules/limboai/.github/actions/setup-linux-toolchain - with: - arch: ${{matrix.opts.arch}} + - name: Set up buildroot + if: matrix.opts.arch == 'x86_64' + shell: bash + run: | + mkdir buildroot + wget https://github.com/godotengine/buildroot/releases/download/godot-2020.11.x-2/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2 -O buildroot/buildroot.tar.bz2 + cd buildroot + echo "16c8302fcb676c1f0fb9df73d6cff250ba1f4286 buildroot.tar.bz2" | shasum --check + tar -xjf buildroot.tar.bz2 --strip-components=1 + ls -l + rm buildroot.tar.bz2 + ./relocate-sdk.sh + cd .. + + - name: Set up buildroot + if: matrix.opts.arch == 'x86_32' + shell: bash + run: | + mkdir buildroot + wget https://github.com/godotengine/buildroot/releases/download/godot-2020.11.x-2/i686-godot-linux-gnu_sdk-buildroot.tar.bz2 -O buildroot/buildroot.tar.bz2 + cd buildroot + echo " buildroot.tar.bz2" + echo "6171652abc54ef219e5187bc53660ee4e2f796f4 buildroot.tar.bz2" | shasum --check + tar -xjf buildroot.tar.bz2 --strip-components=1 + ls -l + rm buildroot.tar.bz2 + ./relocate-sdk.sh + cd .. - name: Set up scons cache uses: actions/cache@v4 diff --git a/.github/workflows/test_builds.yml b/.github/workflows/test_builds.yml index f79e440..c0578fc 100644 --- a/.github/workflows/test_builds.yml +++ b/.github/workflows/test_builds.yml @@ -52,10 +52,18 @@ jobs: with: path: modules/limboai - - name: Set up Linux toolchain - uses: ./modules/limboai/.github/actions/setup-linux-toolchain - with: - arch: x86_64 + - name: Set up buildroot + shell: bash + run: | + mkdir buildroot + wget https://github.com/godotengine/buildroot/releases/download/godot-2020.11.x-2/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2 -O buildroot/buildroot.tar.bz2 + cd buildroot + echo "16c8302fcb676c1f0fb9df73d6cff250ba1f4286 buildroot.tar.bz2" | shasum --check + tar -xjf buildroot.tar.bz2 --strip-components=1 + ls -l + rm buildroot.tar.bz2 + ./relocate-sdk.sh + cd .. - name: Set up scons cache uses: actions/cache@v4