Let's see if github actions doesn't bug out anymore when these are enabled.

This commit is contained in:
Pentarctagon 2021-10-30 16:41:56 -05:00
parent a491c660fb
commit b37114ecbc
No known key found for this signature in database
GPG key ID: 9456BC54A21DBFA0

View file

@ -255,43 +255,39 @@ jobs:
path: |
~/work/wesnoth/wesnoth/projectfiles/Xcode/Wesnoth_Debug.dmg
# enabling both intel and arm macOS jobs would tend to confuse the github actions CI
# sometimes it would succeed, other times it would fail at random with extra entries for macOS jobs that didn't exist in this configuration file
# try re-enabling at some point to see if this got fixed in the mean time
macos-arm-master-release:
runs-on: macos-11.0
# macos-arm-master-release:
# runs-on: macos-11.0
#
# steps:
# - uses: actions/checkout@v2
# with:
# submodules: "recursive"
#
# - name: macOS ARM Release
# run: |
# export CFG=Release
# export CACHE_DIR=~/build-cache
# ./.github/workflows/ci-scripts/macos.sh
steps:
- uses: actions/checkout@v2
with:
submodules: "recursive"
# macos-arm-master-debug:
# runs-on: macos-11.0
#
# steps:
# - uses: actions/checkout@v2
# with:
# submodules: "recursive"
#
# - name: macOS ARM Debug
# run: |
# export CFG=Debug
# export CACHE_DIR=~/build-cache
# ./.github/workflows/ci-scripts/macos.sh
# - name: Upload
# uses: actions/upload-artifact@v2
# with:
# name: macOS-ARM-Debug
# path: |
# ~/work/wesnoth/wesnoth/projectfiles/Xcode/Wesnoth_Debug.dmg
- name: macOS ARM Release
run: |
export CFG=Release
export CACHE_DIR=~/build-cache
./.github/workflows/ci-scripts/macos.sh
macos-arm-master-debug:
runs-on: macos-11.0
steps:
- uses: actions/checkout@v2
with:
submodules: "recursive"
- name: macOS ARM Debug
run: |
export CFG=Debug
export CACHE_DIR=~/build-cache
./.github/workflows/ci-scripts/macos.sh
- name: Upload
uses: actions/upload-artifact@v2
with:
name: macOS-ARM-Debug
path: |
~/work/wesnoth/wesnoth/projectfiles/Xcode/Wesnoth_Debug.dmg
# in the case of needing to recompile the vcpkg-created Windows dependencies, increment the cache-name and key for both Release and Debug
# this will create a brand new cache and recompile the vcpkg dependencies from scratch