From ae042a685bbaceac7ddf505880b7de56a8a9c8c6 Mon Sep 17 00:00:00 2001 From: zoltanvb <101990835+zoltanvb@users.noreply.github.com> Date: Tue, 26 Nov 2024 08:01:51 +0100 Subject: [PATCH] Replace checkout action, remove upload Due to node v20 being incompatible with some of the CI images (too old glibc), the checkout action is replaced by an alternative which does not need node, and upload is removed for now. --- .github/workflows/3DS.yml | 8 +------- .github/workflows/Emscripten.yml | 7 +------ .github/workflows/GameCube.yml | 7 +------ .github/workflows/Linux.yml | 8 +------- .github/workflows/Wii.yml | 7 +------ .github/workflows/WiiU.yml | 8 +------- .github/workflows/Windows-i686-MXE.yml | 8 +------- .github/workflows/Windows-x64-MXE.yml | 8 +------- .gitlab-ci.yml | 7 +++++++ 9 files changed, 15 insertions(+), 53 deletions(-) diff --git a/.github/workflows/3DS.yml b/.github/workflows/3DS.yml index bd2482b27e42..e1825e4b26dc 100644 --- a/.github/workflows/3DS.yml +++ b/.github/workflows/3DS.yml @@ -20,7 +20,7 @@ jobs: options: --user root steps: - - uses: actions/checkout@v3 + - uses: taiki-e/checkout-action@v1 - name: Compile Salamander run: | @@ -34,9 +34,3 @@ jobs: - name: Get short SHA id: slug run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" - - - uses: actions/upload-artifact@v3 - with: - name: RA-3DS-dummy-${{ steps.slug.outputs.sha8 }} - path: | - retroarch_3ds.cia diff --git a/.github/workflows/Emscripten.yml b/.github/workflows/Emscripten.yml index d97f8ba3aba9..ff6f77f5c522 100644 --- a/.github/workflows/Emscripten.yml +++ b/.github/workflows/Emscripten.yml @@ -20,7 +20,7 @@ jobs: options: --user root steps: - - uses: actions/checkout@v3 + - uses: taiki-e/checkout-action@v1 - name: Compile RA run: | @@ -31,8 +31,3 @@ jobs: id: slug run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" - - uses: actions/upload-artifact@v3 - with: - name: RA-Emscripten-dummy-${{ steps.slug.outputs.sha8 }} - path: | - retroarch.js diff --git a/.github/workflows/GameCube.yml b/.github/workflows/GameCube.yml index 0537f44b0738..24823fcb910e 100644 --- a/.github/workflows/GameCube.yml +++ b/.github/workflows/GameCube.yml @@ -20,7 +20,7 @@ jobs: options: --user root steps: - - uses: actions/checkout@v3 + - uses: taiki-e/checkout-action@v1 - name: Compile RA run: | @@ -30,8 +30,3 @@ jobs: id: slug run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" - - uses: actions/upload-artifact@v3 - with: - name: RA-GameCube-dummy-${{ steps.slug.outputs.sha8 }} - path: | - retroarch_ngc.dol diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index 628c280ffcb6..7ce4b1965e00 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Check Out Repo - uses: actions/checkout@v3 + uses: taiki-e/checkout-action@v1 - name: Configure Build run: | @@ -35,9 +35,3 @@ jobs: - name: Get short SHA id: slug run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" - - - uses: actions/upload-artifact@v3 - with: - name: retroarch_linux_i686${{ steps.slug.outputs.sha8 }} - path: | - retroarch diff --git a/.github/workflows/Wii.yml b/.github/workflows/Wii.yml index fd28b2040af0..f5f1e69d14f3 100644 --- a/.github/workflows/Wii.yml +++ b/.github/workflows/Wii.yml @@ -20,7 +20,7 @@ jobs: options: --user root steps: - - uses: actions/checkout@v3 + - uses: taiki-e/checkout-action@v1 - name: Compile Salamander run: | @@ -35,8 +35,3 @@ jobs: id: slug run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" - - uses: actions/upload-artifact@v3 - with: - name: RA-Wii-dummy-${{ steps.slug.outputs.sha8 }} - path: | - retroarch_wii.dol diff --git a/.github/workflows/WiiU.yml b/.github/workflows/WiiU.yml index e5af2933a035..2b2bd74c6f37 100644 --- a/.github/workflows/WiiU.yml +++ b/.github/workflows/WiiU.yml @@ -20,7 +20,7 @@ jobs: options: --user root steps: - - uses: actions/checkout@v3 + - uses: taiki-e/checkout-action@v1 - name: Compile Salamander run: | @@ -34,9 +34,3 @@ jobs: - name: Get short SHA id: slug run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" - - - uses: actions/upload-artifact@v3 - with: - name: RA-WiiU-dummy-${{ steps.slug.outputs.sha8 }} - path: | - retroarch.rpx diff --git a/.github/workflows/Windows-i686-MXE.yml b/.github/workflows/Windows-i686-MXE.yml index 97aa7ab71141..18f288e882ee 100644 --- a/.github/workflows/Windows-i686-MXE.yml +++ b/.github/workflows/Windows-i686-MXE.yml @@ -20,7 +20,7 @@ jobs: options: --user root steps: - - uses: actions/checkout@v3 + - uses: taiki-e/checkout-action@v1 - name: Compile RA run: | @@ -32,9 +32,3 @@ jobs: - name: Get short SHA id: slug run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" - - - uses: actions/upload-artifact@v3 - with: - name: retroarch${{ steps.slug.outputs.sha8 }} - path: | - retroarch.exe diff --git a/.github/workflows/Windows-x64-MXE.yml b/.github/workflows/Windows-x64-MXE.yml index 97ea0276319e..2f57fa319731 100644 --- a/.github/workflows/Windows-x64-MXE.yml +++ b/.github/workflows/Windows-x64-MXE.yml @@ -20,7 +20,7 @@ jobs: options: --user root steps: - - uses: actions/checkout@v3 + - uses: taiki-e/checkout-action@v1 - name: Compile RA run: | @@ -32,9 +32,3 @@ jobs: - name: Get short SHA id: slug run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" - - - uses: actions/upload-artifact@v3 - with: - name: retroarch${{ steps.slug.outputs.sha8 }} - path: | - retroarch.exe diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 008b804c4f73..be1a1e973a0f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,9 @@ stages: - prepare-for-static-cores - trigger-static-cores +env: + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true + build-retroarch-windows-x64: image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-mxe-win64-cross:gcc10 stage: build @@ -880,6 +883,8 @@ build-static-retroarch-ctr: stage: prepare-for-static-cores before_script: - export NUMPROC=$(($(nproc)/3)) + - export ACTIONS_RUNNER_FORCED_INTERNAL_NODE_VERSION=node16 + - export ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION=node16 artifacts: paths: - retroarch-precompiled/ @@ -900,6 +905,7 @@ build-static-retroarch-ctr-legacy: stage: prepare-for-static-cores before_script: - export NUMPROC=$(($(nproc)/3)) + - export ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true artifacts: paths: - retroarch-precompiled/ @@ -920,6 +926,7 @@ build-static-retroarch-dummy-ctr: MEDIA_PATH: .media before_script: - export NUMPROC=$(($(nproc)/3)) + - export ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true artifacts: paths: - retroarch_3ds.cia