Skip to content

Commit

Permalink
Fix CI. (#623)
Browse files Browse the repository at this point in the history
* Bump CI runners to Ubuntu 20.04 and macOS 11.

* Bump HL version in CMakeLists.txt

* Don't codesign macOS binaries.

Codesigning fails for some reason on macos-11 runners and anyway,
signing with some randomly generated certificate that doesn't get distributed is pointless.

* Drop 32-bit Linux CI.

For some reason 32-bit Linux CI is broken with the 20.04 runner.

* Bump versions of actions/checkout, etc
  • Loading branch information
Apprentice-Alchemist authored Sep 21, 2023
1 parent bda70cf commit 20c1e14
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 34 deletions.
43 changes: 10 additions & 33 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs:

include:
- target: linux
runner: ubuntu-18.04
runner: ubuntu-20.04
haxe_nightly_dir: linux64
archive_ext: tar.gz

- target: darwin
runner: macos-10.15
runner: macos-11
haxe_nightly_dir: mac
archive_ext: tar.gz

Expand Down Expand Up @@ -68,6 +68,9 @@ jobs:
- target: darwin
build_system: vs2019

- target: linux
architecture: 32

- target: darwin
architecture: 32

Expand All @@ -76,11 +79,11 @@ jobs:

steps:
- name: "SCM Checkout"
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Add msbuild to PATH
if: matrix.build_system == 'vs2019'
uses: microsoft/setup-msbuild@v1.0.3
uses: microsoft/setup-msbuild@v1
with:
vs-version: '[16.0,17.0)'

Expand All @@ -89,25 +92,6 @@ jobs:
set -eux
case "${{ matrix.target }}${{ matrix.architecture }}" in
linux32)
echo "MARCH=32" >> $GITHUB_ENV
sudo dpkg --add-architecture i386
sudo apt-get update -y
sudo apt-get install --no-install-recommends -y \
gcc-multilib \
libalut-dev:i386 \
libmbedtls-dev:i386 \
libopenal-dev:i386 \
libpng-dev:i386 \
libsdl2-dev:i386 \
libturbojpeg0-dev:i386 \
libuv1-dev:i386 \
libvorbis-dev:i386 \
libz-dev:i386 \
zlib1g-dev:i386 \
libsqlite3-dev:i386
;;
linux64)
echo "MARCH=64" >> $GITHUB_ENV
sudo apt-get update -y
Expand Down Expand Up @@ -199,8 +183,6 @@ jobs:
case "${{ matrix.build_system }}" in
cmake)
case "${{ matrix.target }}${{ matrix.architecture }}" in
linux32)
cmake . -DCMAKE_BUILD_TYPE=${{ matrix.cmake_configuration }} -DCMAKE_TOOLCHAIN_FILE=other/cmake/linux32.toolchain.cmake ;;
windows*)
cmake . -DCMAKE_BUILD_TYPE=${{ matrix.cmake_configuration }} \
-G "${{ matrix.cmake_generator }}" \
Expand Down Expand Up @@ -228,9 +210,6 @@ jobs:
make)
make
if [[ ${{ matrix.target }} == darwin ]]; then
sudo make codesign_osx
fi
sudo make install
if [[ ${{ matrix.target }} == linux ]]; then
sudo ldconfig
Expand Down Expand Up @@ -277,7 +256,6 @@ jobs:
case "${{ matrix.target }}${{matrix.architecture}}" in
darwin*) platform_name=darwin ;;
windows*) platform_name=win${{matrix.architecture}} ;;
linux32) platform_name=linux-i386 ;;
linux64) platform_name=linux-amd64 ;;
esac
Expand All @@ -300,7 +278,7 @@ jobs:
- name: "Share: build artifact"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
path: ${{ env.HASHLINK_DISTRIBUTION }}

Expand All @@ -317,10 +295,10 @@ jobs:
steps:

- name: "SCM Checkout"
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: "Get: all build artifacts"
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3

- name: "Delete previous 'latest' release"
run: |
Expand Down Expand Up @@ -356,7 +334,6 @@ jobs:
--prerelease \
--title "HashLink Nightly Build" \
"artifact/hashlink-${short_commit}-darwin.tar.gz#hashlink-latest-darwin.tar.gz" \
"artifact/hashlink-${short_commit}-linux-i386.tar.gz#hashlink-latest-linux-i386.tar.gz" \
"artifact/hashlink-${short_commit}-linux-amd64.tar.gz#hashlink-latest-linux-amd64.tar.gz" \
"artifact/hashlink-${short_commit}-win32.zip#hashlink-latest-win32.zip" \
"artifact/hashlink-${short_commit}-win64.zip#hashlink-latest-win64.zip"
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.1)

set(HL_VERSION_MAJOR 1)
set(HL_VERSION_MINOR 13)
set(HL_VERSION_MINOR 14)
set(HL_VERSION_PATCH 0)
set(HL_VERSION ${HL_VERSION_MAJOR}.${HL_VERSION_MINOR}.${HL_VERSION_PATCH})

Expand Down

0 comments on commit 20c1e14

Please sign in to comment.