Browse Source

package/ci: can't build on x86 Mac anymore.

Which means it also has to fetch an ARM build of SwiftShader and Vulkan
loader.
pull/641/head
Vladimír Vondruš 2 years ago
parent
commit
188a4257d8
  1. 36
      package/ci/circleci.yml

36
package/ci/circleci.yml

@ -15,10 +15,12 @@ executors:
ubuntu-18_04: ubuntu-18_04:
docker: docker:
- image: ubuntu:bionic-20220427 - image: ubuntu:bionic-20220427
# Anything below 12.5.1 is deprecated as of August 2023 # Anything below 13.4.1 (and all x86 variants) are deprecated as of June 28th
xcode-12_5: # 2024
xcode-13_4:
macos: macos:
xcode: 12.5.1 xcode: 13.4.1
resource_class: macos.m1.medium.gen1
emscripten1: emscripten1:
docker: docker:
# 1.39.0 is the oldest on Docker. Anything before 1.39.2 is useless as emar # 1.39.0 is the oldest on Docker. Anything before 1.39.2 is useless as emar
@ -208,8 +210,8 @@ commands:
# you could just download the artifacts directly, right? RIGHT? # you could just download the artifacts directly, right? RIGHT?
command: | command: |
mkdir -p $HOME/swiftshader && cd $HOME/swiftshader mkdir -p $HOME/swiftshader && cd $HOME/swiftshader
wget https://ci.magnum.graphics/swiftshader-gles-r5464.a6940c8e6e-<< parameters.build >>.zip wget https://ci.magnum.graphics/swiftshader-gles-r5904.14dcbed947-<< parameters.build >>.zip
unzip swiftshader-gles-r5464.a6940c8e6e-<< parameters.build >>.zip unzip swiftshader-gles-r5904.14dcbed947-<< parameters.build >>.zip
install-swiftshader-vulkan: install-swiftshader-vulkan:
parameters: parameters:
@ -223,8 +225,8 @@ commands:
# you could just download the artifacts directly, right? RIGHT? # you could just download the artifacts directly, right? RIGHT?
command: | command: |
mkdir -p $HOME/swiftshader && cd $HOME/swiftshader mkdir -p $HOME/swiftshader && cd $HOME/swiftshader
wget https://ci.magnum.graphics/swiftshader-vulkan-r5464.a6940c8e6e-<< parameters.build >>.zip wget https://ci.magnum.graphics/swiftshader-vulkan-r5904.14dcbed947-<< parameters.build >>.zip
unzip swiftshader-vulkan-r5464.a6940c8e6e-<< parameters.build >>.zip unzip swiftshader-vulkan-r5904.14dcbed947-<< parameters.build >>.zip
install-vulkan-loader: install-vulkan-loader:
parameters: parameters:
@ -398,7 +400,7 @@ jobs:
- install-cmake: - install-cmake:
version: "3.5.2" version: "3.5.2"
- install-swiftshader-gles: - install-swiftshader-gles:
build: ubuntu-16.04 build: ubuntu-18.04
- build: - build:
script: unix-desktop-gles.sh script: unix-desktop-gles.sh
- lcov - lcov
@ -430,7 +432,7 @@ jobs:
- install-cmake: - install-cmake:
version: "3.5.2" version: "3.5.2"
- install-swiftshader-gles: - install-swiftshader-gles:
build: ubuntu-16.04 build: ubuntu-18.04
- build: - build:
script: unix-desktop-gles.sh script: unix-desktop-gles.sh
- lcov - lcov
@ -559,7 +561,7 @@ jobs:
script: unix-desktop.sh script: unix-desktop.sh
macos-gl: macos-gl:
executor: xcode-12_5 executor: xcode-13_4
environment: environment:
CMAKE_CXX_FLAGS: --coverage CMAKE_CXX_FLAGS: --coverage
CONFIGURATION: Debug CONFIGURATION: Debug
@ -574,7 +576,7 @@ jobs:
- lcov - lcov
macos-gles3: macos-gles3:
executor: xcode-12_5 executor: xcode-13_4
environment: environment:
CMAKE_CXX_FLAGS: --coverage CMAKE_CXX_FLAGS: --coverage
CONFIGURATION: Debug CONFIGURATION: Debug
@ -587,13 +589,13 @@ jobs:
- install-base-macos: - install-base-macos:
extra: sdl2 glfw wget extra: sdl2 glfw wget
- install-swiftshader-gles: - install-swiftshader-gles:
build: macos-10.15 build: macos12-arm64
- build: - build:
script: unix-desktop-gles.sh script: unix-desktop-gles.sh
- lcov - lcov
macos-vulkan: macos-vulkan:
executor: xcode-12_5 executor: xcode-13_4
environment: environment:
CMAKE_CXX_FLAGS: --coverage CMAKE_CXX_FLAGS: --coverage
CONFIGURATION: Debug CONFIGURATION: Debug
@ -601,15 +603,15 @@ jobs:
- install-base-macos: - install-base-macos:
extra: sdl2 glfw wget extra: sdl2 glfw wget
- install-swiftshader-vulkan: - install-swiftshader-vulkan:
build: macos-10.15 build: macos12-arm64
- install-vulkan-loader: - install-vulkan-loader:
build: macos-10.15 build: macos12-x64-arm64
- build: - build:
script: unix-desktop-vulkan.sh script: unix-desktop-vulkan.sh
- lcov - lcov
macos-static: macos-static:
executor: xcode-12_5 executor: xcode-13_4
environment: environment:
# STUPID yml interprets unquoted ON as a boolean # STUPID yml interprets unquoted ON as a boolean
BUILD_STATIC: "ON" BUILD_STATIC: "ON"
@ -699,7 +701,7 @@ jobs:
script: android-x86-vulkan.sh script: android-x86-vulkan.sh
ios-gles3: ios-gles3:
executor: xcode-12_5 executor: xcode-13_4
environment: environment:
# STUPID yml interprets unquoted ON as a boolean # STUPID yml interprets unquoted ON as a boolean
TARGET_GLES2: "OFF" TARGET_GLES2: "OFF"

Loading…
Cancel
Save