Skip to content

Commit

Permalink
Another round of changes to the Github workflows.
Browse files Browse the repository at this point in the history
* Build ref_gles1 only on Linux, it's of limited use under MacOS and Win.
* Fetch openal-soft from Github, the other mirror had several connection
  problems in the past.
* Always include the latest curl.dll in Windows builds. Since this isn't
  a stripped down build of curl, it's better to have it up to date.
* Make sure that we are on Ubuntu 22.04. Otherwise the binaries wouldn't
  work on newer distros when `ubuntu-latest` becomes Ubuntu 24.04.
* Fix some typos.
  • Loading branch information
Yamagi committed Aug 18, 2024
1 parent e2d8572 commit 6066b3c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ concurrency:
group: ${{github.workflow}}-${{github.event_name == 'pull_request' && github.head_ref || github.sha}}
cancel-in-progress: true
jobs:
build_ubuntu_x64_64:
runs-on: ubuntu-latest
build_ubuntu_x86_64:
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
run: |
# Public runners come with 3 CPUs.
gmake -j3
gmake -j3 ref_gles1
- name: Create testbuild package
run: |
# Create release directory tree
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/win32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:
run: |
# Public runners come with 2 CPUs.
make -j2
make -j2 ref_gles1
- name: Create testbuild package
shell: msys2 {0}
run: |
Expand All @@ -71,13 +70,13 @@ jobs:
unzip -o SDL2-2.30.6-win32-x86.zip
cp SDL2.dll publish/quake2-win32-${{github.sha}}/
# openal-soft
wget -c https://www.openal-soft.org/openal-binaries/openal-soft-1.23.1-bin.zip
wget -c https://github.com/kcat/openal-soft/releases/download/1.23.1/openal-soft-1.23.1-bin.zip
unzip -o openal-soft-1.23.1-bin.zip
cp openal-soft-1.23.1-bin/bin/Win32/soft_oal.dll publish/quake2-win32-${{github.sha}}/openal32.dll
# curl (releases use a custom build curl.dll)
wget -c https://curl.se/windows/dl-8.9.1_1/curl-8.9.1_1-win32-mingw.zip
unzip -o curl-8.9.1_1-win32-mingw.zip
cp curl-8.9.1_1-win32-mingw/bin/libcurl.dll publish/quake2-win32-${{github.sha}}/curl.dll
wget -c -O curl-mingw-latest.zip "https://curl.se/windows/latest.cgi?p=win32-mingw.zip"
unzip -o curl-mingw-latest.zip
cp curl-*-win32-mingw/bin/libcurl.dll publish/quake2-win32-${{github.sha}}/curl.dll
- name: Upload testbuild package
uses: actions/upload-artifact@v4
with:
Expand Down

0 comments on commit 6066b3c

Please sign in to comment.