Attempt to trim down the CI after getting caught in github's automated platform abuse tool.
Removed: * Two linux jobs - now only two combinations of the gcc/clang + scons/cmake matrix are run. * Two macOS jobs - the Release configuration is now only run on ARM, and the Debug configuration is only run on Intel. Also pinned vcpkg to a particular commit so it doesn't ignore the cache when new versions of dependencies come out. This does mean though that when dependencies or dependency versions change that the vcpkg commit and the cache ID will need to be manually updated. And while it's *probably* safe to have stable and master share the same vcpkg cache, this may become problematic if their dependencies and/or versions become incompatible.
This commit is contained in:
Pentarctagon
parent
bfe9c3d937
commit
0a119b00eb
1 changed files with 21 additions and 99 deletions
120
.github/workflows/ci-main.yml
vendored
120
.github/workflows/ci-main.yml
vendored
|
|
@ -14,7 +14,7 @@ jobs:
|
|||
|
||||
name: Discord Notification
|
||||
|
||||
needs: [ubuntu-2004-scons-gcc-release-lto, ubuntu-2004-scons-clang-debug, ubuntu-2004-cmake-clang-release, ubuntu-2004-cmake-gcc-debug, steam-runtime, mingw, flatpak, translations, macos-intel-master-release, macos-intel-master-debug, windows-release, windows-debug]
|
||||
needs: [ubuntu-2004-scons-gcc-release-lto, ubuntu-2004-cmake-clang-debug, steam-runtime, mingw, flatpak, translations, macos-intel-master-debug, macos-arm-master-release, windows-release, windows-debug]
|
||||
if: always()
|
||||
|
||||
steps:
|
||||
|
|
@ -51,29 +51,7 @@ jobs:
|
|||
export CACHE_DIR=/home/wesnoth-CI/build
|
||||
./.github/workflows/ci-scripts/ubuntu.sh
|
||||
|
||||
ubuntu-2004-scons-clang-debug:
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: "recursive"
|
||||
|
||||
- name: Ubuntu 20.04
|
||||
run: |
|
||||
export BRANCH=master
|
||||
export IMAGE=2004
|
||||
export NLS=false
|
||||
export TOOL=scons
|
||||
export CC=clang
|
||||
export CXX=clang++
|
||||
export CXX_STD=17
|
||||
export CFG=debug
|
||||
export LTO=false
|
||||
export CACHE_DIR=/home/wesnoth-CI/build
|
||||
./.github/workflows/ci-scripts/ubuntu.sh master
|
||||
|
||||
ubuntu-2004-cmake-clang-release:
|
||||
ubuntu-2004-cmake-clang-debug:
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
steps:
|
||||
|
|
@ -90,28 +68,6 @@ jobs:
|
|||
export CC=clang
|
||||
export CXX=clang++
|
||||
export CXX_STD=17
|
||||
export CFG=release
|
||||
export LTO=false
|
||||
export CACHE_DIR=/home/wesnoth-CI/build
|
||||
./.github/workflows/ci-scripts/ubuntu.sh
|
||||
|
||||
ubuntu-2004-cmake-gcc-debug:
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: "recursive"
|
||||
|
||||
- name: Ubuntu 20.04
|
||||
run: |
|
||||
export BRANCH=master
|
||||
export IMAGE=2004
|
||||
export NLS=false
|
||||
export TOOL=cmake
|
||||
export CC=gcc
|
||||
export CXX=g++
|
||||
export CXX_STD=17
|
||||
export CFG=debug
|
||||
export LTO=false
|
||||
export CACHE_DIR=/home/wesnoth-CI/build
|
||||
|
|
@ -220,20 +176,6 @@ jobs:
|
|||
export CACHE_DIR=/home/wesnoth-CI/build
|
||||
./.github/workflows/ci-scripts/ubuntu.sh
|
||||
|
||||
macos-intel-master-release:
|
||||
runs-on: macos-10.15
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: "recursive"
|
||||
|
||||
- name: macOS Intel Release
|
||||
run: |
|
||||
export CFG=Release
|
||||
export CACHE_DIR=~/build-cache
|
||||
./.github/workflows/ci-scripts/macos.sh
|
||||
|
||||
macos-intel-master-debug:
|
||||
runs-on: macos-10.15
|
||||
|
||||
|
|
@ -248,43 +190,19 @@ jobs:
|
|||
export CACHE_DIR=~/build-cache
|
||||
./.github/workflows/ci-scripts/macos.sh
|
||||
|
||||
# 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
|
||||
|
||||
# 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
|
||||
|
|
@ -297,13 +215,13 @@ jobs:
|
|||
submodules: "recursive"
|
||||
|
||||
- name: Cache object files
|
||||
id: windows-master-N007
|
||||
id: windows-master-N009
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
D:/a/wesnoth/vcpkg
|
||||
D:/a/wesnoth/wesnoth/vcpkg_installed
|
||||
key: windows-master-N008
|
||||
key: windows-master-N009
|
||||
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@v1.0.2
|
||||
|
|
@ -312,6 +230,8 @@ jobs:
|
|||
shell: cmd
|
||||
run: |
|
||||
git clone --depth=1 https://github.com/microsoft/vcpkg.git D:/a/wesnoth/vcpkg
|
||||
cd D:/a/wesnoth/vcpkg
|
||||
git checkout cbc22a396c88d098247fe7f79f0913a952e1f77d
|
||||
D:/a/wesnoth/vcpkg/bootstrap-vcpkg.bat
|
||||
|
||||
- name: Setup cmake
|
||||
|
|
@ -342,13 +262,13 @@ jobs:
|
|||
submodules: "recursive"
|
||||
|
||||
- name: Cache object files
|
||||
id: windows-master-N008
|
||||
id: windows-master-N009
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
D:/a/wesnoth/vcpkg
|
||||
D:/a/wesnoth/wesnoth/vcpkg_installed
|
||||
key: windows-master-N007
|
||||
key: windows-master-N009
|
||||
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@v1.0.2
|
||||
|
|
@ -357,6 +277,8 @@ jobs:
|
|||
shell: cmd
|
||||
run: |
|
||||
git clone --depth=1 https://github.com/microsoft/vcpkg.git D:/a/wesnoth/vcpkg
|
||||
cd D:/a/wesnoth/vcpkg
|
||||
git checkout cbc22a396c88d098247fe7f79f0913a952e1f77d
|
||||
D:/a/wesnoth/vcpkg/bootstrap-vcpkg.bat
|
||||
|
||||
- name: Setup cmake
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue