Skip to content

Commit

Permalink
Improve CI
Browse files Browse the repository at this point in the history
This commit improves GitHub Actions by using matrix and sending
artifacts.
  • Loading branch information
er2off committed May 20, 2023
1 parent a6c26f4 commit 383d2e5
Show file tree
Hide file tree
Showing 9 changed files with 165 additions and 208 deletions.
198 changes: 97 additions & 101 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,111 +1,107 @@
name: Build

on: [push, pull_request]
env:
WAF_FLAGS: -T release --disable-warns --prefix=build_hl2

jobs:
build-linux-i386:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Build linux-i386
run: |
scripts/build-ubuntu-i386.sh
build-linux-amd64:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
- name: Build linux-amd64
run: |
scripts/build-ubuntu-amd64.sh
build-android-armv7a:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
- name: Build android-armv7a
run: |
scripts/build-android-armv7a.sh
build-windows-i386:
runs-on: windows-2019

steps:
- uses: actions/checkout@v2
- name: Build windows-i386
run: |
git submodule init && git submodule update
./waf.bat configure -T debug
./waf.bat build
build-windows-amd64:
runs-on: windows-2019

steps:
- uses: actions/checkout@v2
- name: Build windows-amd64
run: |
git submodule init && git submodule update
./waf.bat configure -T debug -8
./waf.bat build
build-dedicated-windows-i386:
runs-on: windows-2019

steps:
- uses: actions/checkout@v2
- name: Build dedicated windows-i386
run: |
git submodule init && git submodule update
./waf.bat configure -T debug -d
./waf.bat build
build-dedicated-windows-amd64:
runs-on: windows-2019

build-linux:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
bits: ['', '--64bits']
android: ['']
flags: ['', '-d']
include:
- os: ubuntu-20.04
bits: ''
android: '--android=armeabi-v7a-hard,4.9,21 --togles'
flags: ''
runs-on: ${{ matrix.os }}
env:
DEPS: libopenal-dev libpng-dev libjpeg-dev libfreetype6-dev libfontconfig1-dev libcurl4-gnutls-dev libsdl2-dev zlib1g-dev libbz2-dev libedit-dev
steps:
- uses: actions/checkout@v2
- name: Build dedicated windows-amd64
run: |
git submodule init && git submodule update
./waf.bat configure -T debug -d -8
./waf.bat build
build-dedicated-linux-i386:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
- name: Build dedicated linux-i386
run: |
scripts/build-ubuntu-i386.sh -d
build-dedicated-linux-amd64:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
- name: Build dedicated linux-amd64
run: |
scripts/build-ubuntu-amd64.sh -d
build-macos-amd64:
- uses: actions/checkout@v3
with:
submodules: recursive

- name: Install common dependencies
run: sudo apt-get update && sudo apt-get install -y g++-multilib gcc-multilib
- name: Install 32bit dependencies
if: ${{ matrix.bits == '' && !matrix.android }}
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install -y aptitude
sudo aptitude install -y $(echo $DEPS | sed -r 's/[a-z0-9_\-]+/&:i386/g')
echo "PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig" >> $GITHUB_ENV
- name: Install 64bit dependencies
if: ${{ matrix.bits != '' }}
run: |
sudo apt-get install -y $DEPS
- name: Install Android dependencies
if: ${{ matrix.android != '' }}
run: |
wget https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip -o /dev/null
unzip android-ndk-r10e-linux-x86_64.zip
export NDK_HOME=$PWD/android-ndk-r10e/
echo "NDK_HOME=$NDK_HOME" >> $GITHUB_ENV
echo "ANDROID_NDK_HOME=$NDK_HOME" >> $GITHUB_ENV
- name: Configure
run: ./waf configure ${{ matrix.bits }} ${{ matrix.android }} ${{ matrix.flags }} $WAF_FLAGS
- name: Build ${{ matrix.os }}
run: ./waf install
- name: Tar binaries
run: tar cvf build.tar build_hl2
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: Linux${{matrix.bits}}${{matrix.flags}}${{matrix.android}}.tar
path: build.tar

build-macos:
strategy:
fail-fast: false
matrix:
flags: ['', '-d']
runs-on: macos-latest

steps:
- uses: actions/checkout@v2
- name: Build macos-amd64
run: |
scripts/build-macos-amd64.sh
- uses: actions/checkout@v3
with:
submodules: recursive

- name: Install dependencies
run: brew install sdl2

- name: Configure
run: ./waf configure --64bits ${{ matrix.flags }} $WAF_FLAGS
- name: Build macos-amd64
run: ./waf install
- name: Tar binaries
run: tar cvf build.tar build_hl2
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: macOS--64bits${{matrix.flags}}.tar
path: build.tar

build-windows:
strategy:
fail-fast: false
matrix:
os: [windows-2019]
bits: ['', '--64bits']
flags: ['', '-d']
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
with:
submodules: recursive

build-dedicated-macos-amd64:
runs-on: macos-latest
- name: Configure
run: ./waf configure ${{ matrix.bits }} ${{ matrix.flags }} ${{ env.WAF_FLAGS }}
- name: Build ${{ matrix.os }}
run: ./waf install

steps:
- uses: actions/checkout@v2
- name: Build dedicated macos-amd64
run: |
scripts/build-macos-amd64.sh -d
112 changes: 68 additions & 44 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,59 +1,83 @@
name: Tests

on: [push, pull_request]
env:
WAF_FLAGS: -T release --disable-warns --prefix=build_tests --tests --sanitize=address,undefined

jobs:
tests-linux-i386:
runs-on: ubuntu-20.04

tests-linux:
strategy:
matrix:
os: [ubuntu-latest, ubuntu-20.04]
bits: ['', '--64bits']
android: ['']
runs-on: ${{ matrix.os }}
env:
DEPS: libbz2-dev
steps:
- uses: actions/checkout@v2
- name: Run tests linux-i386
run: |
scripts/tests-ubuntu-i386.sh
- uses: actions/checkout@v3
with:
submodules: recursive

tests-linux-amd64:
runs-on: ubuntu-20.04
- name: Install common dependencies
run: sudo apt-get update && sudo apt-get install -y g++-multilib gcc-multilib
- name: Install 32bit dependencies
if: ${{ matrix.bits == '' && !matrix.android }}
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install aptitude
sudo aptitude install -y $(echo $DEPS | sed -r 's/[a-z0-9_\-]+/&:i386/g')
echo "PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig" >> $GITHUB_ENV
- name: Install 64bit dependencies
if: ${{ matrix.bits != '' }}
run: |
sudo apt-get install -y $DEPS
steps:
- uses: actions/checkout@v2
- name: Run tests linux-amd64
run: |
scripts/tests-ubuntu-amd64.sh
- name: Configure
run: ./waf configure ${{ matrix.bits }} $WAF_FLAGS
- name: Build ${{ matrix.os }}
run: ./waf install
- name: Run tests
run: |
cd build_tests
LD_LIBRARY_PATH=bin/ ./unittest
tests-macos-amd64:
tests-macos:
runs-on: macos-latest

steps:
- uses: actions/checkout@v2
- name: Run tests macos-amd64
run: |
scripts/tests-macos-amd64.sh
- uses: actions/checkout@v3
with:
submodules: recursive

tests-windows-i386:
runs-on: windows-2019
- name: Configure
run: ./waf configure --64bits $WAF_FLAGS
- name: Build macos-amd64
run: ./waf install
- name: Run tests
run: |
cd build_tests
DYLD_LIBRARY_PATH=bin/ ./unittest
tests-windows:
strategy:
matrix:
os: [windows-2019]
bits: ['', '--64bits']
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Run tests windows-i386
run: |
git submodule init && git submodule update
./waf.bat configure -T release --tests --prefix=out/
./waf.bat install
cd out
$env:Path = "bin";
./unittest.exe
tests-windows-amd64:
runs-on: windows-2019
- uses: actions/checkout@v3
with:
submodules: recursive

- name: Configure
run: ./waf configure ${{ matrix.bits }} ${{ env.WAF_FLAGS }}

- name: Build ${{ matrix.os }}
run: ./waf install
- name: Run tests
run: |
cd build_tests
$env:Path = "bin";
./unittest.exe
steps:
- uses: actions/checkout@v2
- name: Run tests windows-amd64
run: |
git submodule init && git submodule update
./waf.bat configure -T release --tests --prefix=out/ -8
./waf.bat install
cd out
$env:Path = "bin";
./unittest.exe
9 changes: 0 additions & 9 deletions scripts/build-android-armv7a.sh

This file was deleted.

8 changes: 0 additions & 8 deletions scripts/build-macos-amd64.sh

This file was deleted.

8 changes: 0 additions & 8 deletions scripts/build-ubuntu-amd64.sh

This file was deleted.

10 changes: 0 additions & 10 deletions scripts/build-ubuntu-i386.sh

This file was deleted.

7 changes: 0 additions & 7 deletions scripts/tests-macos-amd64.sh

This file was deleted.

10 changes: 0 additions & 10 deletions scripts/tests-ubuntu-amd64.sh

This file was deleted.

Loading

0 comments on commit 383d2e5

Please sign in to comment.