Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

workflows/cmake.yml:add tests for recent gcc versions;migrate to checkoutv3 #250

Merged
merged 17 commits into from
Aug 20, 2022
Merged

workflows/cmake.yml:add tests for recent gcc versions;migrate to checkoutv3 #250

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0018f3a
workflows/cmake.yml:test on Ubuntu Jammy (22.04);migrate to checkoutv3
andy5995 Aug 17, 2022
aa3f2ba
maybe fix ssh link error on Ubuntu Jammy
andy5995 Aug 17, 2022
f650e61
remove libcurl4-gnutls-dev
andy5995 Aug 17, 2022
e97d03e
use cmake FindCURL module
andy5995 Aug 17, 2022
3c8df94
for OpenSSL, use include instead of find_package
andy5995 Aug 17, 2022
d4e7d21
remove jammy, add gcc-10 and 11 test
andy5995 Aug 17, 2022
7782d06
revert now-unrelated changes
andy5995 Aug 17, 2022
c2a8d42
clean-up
andy5995 Aug 17, 2022
0363021
add VERBOSE flag to make
andy5995 Aug 17, 2022
e3ddc75
Update .github/workflows/cmake.yml
andy5995 Aug 17, 2022
a4ecd09
Update .github/workflows/cmake.yml
andy5995 Aug 17, 2022
63edf7b
use '-f' option from build script to force clang
andy5995 Aug 18, 2022
6621a33
force dynamic libs with '-d'
andy5995 Aug 18, 2022
5100b01
mk/linux/setupBuildDeps.sh:fix script so 22.04 is detected
andy5995 Aug 19, 2022
70e42c9
revert removal of commented macos jobs
andy5995 Aug 19, 2022
6548ce4
run apt-get update and upgrade
andy5995 Aug 19, 2022
c6aad33
cleanup Prep snapshot section
andy5995 Aug 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 42 additions & 18 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,56 @@ jobs:
strategy:
fail-fast: false
matrix:
arch: [x64]
os: [ubuntu-18.04, ubuntu-latest]
os: [ubuntu-18.04, ubuntu-20.04]
compiler: [gcc, clang]
runs-on: ${{ matrix.os }}
env:
MATRIX_COMPILER: ${{matrix.compiler}}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Get dependencies
run: |
sudo apt update
run: |
sudo apt-get update && sudo apt-get -y upgrade
sudo mk/linux/setupBuildDeps.sh

- name: Bulid MegaGlest With GCC Compiler
if: ${{ matrix.compiler == 'gcc' }}
env:
CC: gcc
CXX: g++
run: mk/linux/build-mg.sh
- name: Build

- name: Bulid MegaGlest With Clang Compiler
if: ${{ matrix.compiler == 'clang' }}
env:
CC: clang
CXX: clang++
run: mk/linux/build-mg.sh
run: |
if [ "${MATRIX_COMPILER}" = "gcc" ]; then
eval "CC=gcc && CXX=g++"
else
eval "CC=clang && CXX=clang++"
fi
mk/linux/build-mg.sh -m
make -C build -j$(nproc) VERBOSE=1
andy5995 marked this conversation as resolved.
Show resolved Hide resolved

build-latest-gcc:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04]
compiler: [10, 11] # 12 is not available in focal at this time, and MG won't build on 22.04
runs-on: ubuntu-20.04
env:
CC: gcc-${{matrix.compiler}}
CXX: g++-${{matrix.compiler}}
steps:
- uses: actions/checkout@v3
- name: Get dependencies
run: |
if [ "${CC}" = "gcc-11" ]; then
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157;
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
fi
sudo apt-get update && sudo apt-get -y upgrade
sudo apt-get install -y $CC $CXX
sudo mk/linux/setupBuildDeps.sh
- name: Build
run: |
mk/linux/build-mg.sh -m
make -C build -j$(nproc) VERBOSE=1
andy5995 marked this conversation as resolved.
Show resolved Hide resolved

- name: Prepare Snapshot
if: ${{ matrix.compiler == 'gcc' && matrix.os == 'ubuntu-latest' }}
Expand Down Expand Up @@ -75,7 +99,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Cache Vcpkg Libs
uses: actions/cache@v2
Expand Down
4 changes: 2 additions & 2 deletions mk/linux/setupBuildDeps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ case $distribution in
#name > bionic
installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libjpeg-dev libpng-dev libfreetype6-dev libwxgtk3.0-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libvlccore-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn11-dev libgnutls28-dev libnghttp2-dev libssh2-1-dev libidn2-dev libpsl-dev"
;;
20.04)
"20.04"|"22.04*")
#name > Focal Fossa
installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libjpeg-dev libpng-dev libfreetype6-dev libwxgtk3.0-gtk3-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libvlccore-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn2-dev libpsl-dev libgnutls28-dev libnghttp2-dev libssh-dev libbrotli-dev"
;;
Expand All @@ -185,7 +185,7 @@ case $distribution in
;;
esac
;;

LinuxMint|Linuxmint)
case $release in
2)
Expand Down