From 63bc095e6505bd619cc64d11056ec3df90d03aed Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Wed, 8 May 2024 19:47:40 -0230 Subject: [PATCH] Remove 32-bit builds from CI on Github and Gitlab. --- .github/workflows/build.yml | 4 ++-- .gitlab-ci.yml | 32 +++----------------------------- 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 765b901f8..51b2d11d8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: runs-on: windows-latest strategy: matrix: - platform: [x64, Win32] + platform: [x64] env: Platform: ${{ matrix.platform }} SDL2_version: 2.26.0 @@ -59,7 +59,7 @@ jobs: 7z x "C:\SDL2-devel.zip" -o"C:\" xcopy /S "C:\SDL2-%SDL2_version%\include" src\common if %Platform%==x64 xcopy /S "C:\SDL2-%SDL2_version%\lib\x64" src\os\windows - if %Platform%==Win32 xcopy /S "C:\SDL2-%SDL2_version%\lib\x86" src\os\windows + - name: Build Stella run: | msbuild src\os\windows\Stella.sln diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea97cc662..11beb4e88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,18 +18,10 @@ include: - project: 'libretro-infrastructure/ci-templates' file: '/windows-x64-mingw.yml' - # Windows 32-bit - - project: 'libretro-infrastructure/ci-templates' - file: '/windows-i686-mingw.yml' - # Linux 64-bit - project: 'libretro-infrastructure/ci-templates' file: '/linux-x64.yml' - # Linux 32-bit - - project: 'libretro-infrastructure/ci-templates' - file: '/linux-i686.yml' - # MacOS 64-bit - project: 'libretro-infrastructure/ci-templates' file: '/osx-x64.yml' @@ -59,7 +51,7 @@ include: # tvOS (AppleTV) - project: 'libretro-infrastructure/ci-templates' file: '/tvos-arm64.yml' - + #################################### MISC ################################## # Stages for building @@ -79,24 +71,12 @@ libretro-build-windows-x64: - .libretro-windows-x64-mingw-make-default - .core-defs -# Windows 32-bit -libretro-build-windows-i686: - extends: - - .libretro-windows-i686-mingw-make-default - - .core-defs - # Linux 64-bit libretro-build-linux-x64: extends: - .libretro-linux-x64-make-default - .core-defs -# Linux 32-bit -libretro-build-linux-i686: - extends: - - .libretro-linux-i686-make-default - - .core-defs - # MacOS 64-bit libretro-build-osx-x64: extends: @@ -108,7 +88,7 @@ libretro-build-osx-arm64: extends: - .libretro-osx-arm64-make-default - .core-defs - + ################################### CELLULAR ################################# # Android ARMv7a android-armeabi-v7a: @@ -127,12 +107,6 @@ android-x86_64: extends: - .libretro-android-jni-x86_64 - .core-defs - -# Android 32-bit x86 -android-x86: - extends: - - .libretro-android-jni-x86 - - .core-defs # iOS libretro-build-ios-arm64: @@ -145,7 +119,7 @@ libretro-build-ios9: extends: - .libretro-ios9-make-default - .core-defs - + # tvOS libretro-build-tvos-arm64: extends: