mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-20 23:14:59 +01:00
Merge pull request #381 from MaSzyna-EU07/feature/no-avx-build
ci: Windows and Linux builds without AVX2, named _noavx2, in the public download
This commit is contained in:
86
.github/workflows/build_bin.yml
vendored
86
.github/workflows/build_bin.yml
vendored
@@ -32,13 +32,27 @@ jobs:
|
|||||||
# running is left to finish; with a build cancelled the publish job of that run is skipped. A push
|
# running is left to finish; with a build cancelled the publish job of that run is skipped. A push
|
||||||
# to master gets a group of its own, its commit, so the builds of master are never cancelled.
|
# to master gets a group of its own, its commit, so the builds of master are never cancelled.
|
||||||
|
|
||||||
|
# Windows is built twice: with AVX2 (the default of ENABLE_AVX2) and without it, for CPUs older
|
||||||
|
# than Haswell (2013). Each variant has its own concurrency group, or one would cancel the other.
|
||||||
|
|
||||||
windows:
|
windows:
|
||||||
name: Windows x64 / MSVC
|
name: Windows x64 / MSVC / ${{ matrix.variant.name }}
|
||||||
runs-on: windows-2022
|
runs-on: windows-2022
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ${{ github.workflow }}-windows-${{ github.event_name }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
|
group: ${{ github.workflow }}-windows-${{ matrix.variant.suffix }}-${{ github.event_name }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
|
||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
variant:
|
||||||
|
- name: "AVX2"
|
||||||
|
suffix: "avx2"
|
||||||
|
cmake_flags: "-DENABLE_AVX2=ON"
|
||||||
|
- name: "No AVX2"
|
||||||
|
suffix: "noavx2"
|
||||||
|
cmake_flags: "-DENABLE_AVX2=OFF"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
|
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
|
||||||
@@ -112,11 +126,13 @@ jobs:
|
|||||||
$pythonRoot = Split-Path $pythonExe
|
$pythonRoot = Split-Path $pythonExe
|
||||||
|
|
||||||
Write-Host "Python root: $pythonRoot"
|
Write-Host "Python root: $pythonRoot"
|
||||||
|
Write-Host "Extra CMake flags: ${{ matrix.variant.cmake_flags }}"
|
||||||
|
|
||||||
cmake -S . -B build `
|
cmake -S . -B build `
|
||||||
-G "Visual Studio 17 2022" `
|
-G "Visual Studio 17 2022" `
|
||||||
-A x64 `
|
-A x64 `
|
||||||
"-DPython3_ROOT_DIR=$pythonRoot"
|
"-DPython3_ROOT_DIR=$pythonRoot" `
|
||||||
|
${{ matrix.variant.cmake_flags }}
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
@@ -167,7 +183,7 @@ jobs:
|
|||||||
- name: Upload Windows build
|
- name: Upload Windows build
|
||||||
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
||||||
with:
|
with:
|
||||||
name: maszyna-windows-x64-${{ env.CONFIG_WIN }}
|
name: maszyna-windows-x64-${{ matrix.variant.suffix }}-${{ env.CONFIG_WIN }}
|
||||||
path: |
|
path: |
|
||||||
build/bin/${{ env.CONFIG_WIN }}/
|
build/bin/${{ env.CONFIG_WIN }}/
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
@@ -176,7 +192,7 @@ jobs:
|
|||||||
- name: Upload Windows debug symbols
|
- name: Upload Windows debug symbols
|
||||||
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
||||||
with:
|
with:
|
||||||
name: maszyna-windows-x64-symbols-${{ env.CONFIG_WIN }}
|
name: maszyna-windows-x64-symbols-${{ matrix.variant.suffix }}-${{ env.CONFIG_WIN }}
|
||||||
path: |
|
path: |
|
||||||
build/pdb/${{ env.CONFIG_WIN }}/*.pdb
|
build/pdb/${{ env.CONFIG_WIN }}/*.pdb
|
||||||
build/bin/${{ env.CONFIG_WIN }}/*.map
|
build/bin/${{ env.CONFIG_WIN }}/*.map
|
||||||
@@ -189,13 +205,24 @@ jobs:
|
|||||||
# ============================================================
|
# ============================================================
|
||||||
|
|
||||||
linux:
|
linux:
|
||||||
name: Linux x64 / GCC
|
name: Linux x64 / GCC / ${{ matrix.variant.name }}
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
# see the note above the windows job
|
# see the notes above the windows job: two variants, each with a concurrency group of its own
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ${{ github.workflow }}-linux-${{ github.event_name }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
|
group: ${{ github.workflow }}-linux-${{ matrix.variant.suffix }}-${{ github.event_name }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
|
||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
variant:
|
||||||
|
- name: "AVX2"
|
||||||
|
suffix: "avx2"
|
||||||
|
cmake_flags: "-DENABLE_AVX2=ON"
|
||||||
|
- name: "No AVX2"
|
||||||
|
suffix: "noavx2"
|
||||||
|
cmake_flags: "-DENABLE_AVX2=OFF"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
|
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
|
||||||
@@ -292,6 +319,7 @@ jobs:
|
|||||||
-DWITH_ZMQ=OFF \
|
-DWITH_ZMQ=OFF \
|
||||||
-DWITH_OPENVR=OFF \
|
-DWITH_OPENVR=OFF \
|
||||||
-DUSE_LTO=OFF \
|
-DUSE_LTO=OFF \
|
||||||
|
${{ matrix.variant.cmake_flags }} \
|
||||||
-DPython3_EXECUTABLE="${{ steps.python.outputs.python-path }}" \
|
-DPython3_EXECUTABLE="${{ steps.python.outputs.python-path }}" \
|
||||||
-DCMAKE_CXX_FLAGS="-Wno-attributes -fno-inline-functions-called-once"
|
-DCMAKE_CXX_FLAGS="-Wno-attributes -fno-inline-functions-called-once"
|
||||||
|
|
||||||
@@ -357,7 +385,7 @@ jobs:
|
|||||||
- name: Upload Linux build
|
- name: Upload Linux build
|
||||||
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
||||||
with:
|
with:
|
||||||
name: maszyna-linux-x64-${{ env.CONFIG_LINUX }}
|
name: maszyna-linux-x64-${{ matrix.variant.suffix }}-${{ env.CONFIG_LINUX }}
|
||||||
path: |
|
path: |
|
||||||
build/bin/
|
build/bin/
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
@@ -380,29 +408,47 @@ jobs:
|
|||||||
cancel-in-progress: false
|
cancel-in-progress: false
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Download Windows build
|
# the AVX2 build keeps the old name of the download, so the links already handed out still work
|
||||||
|
- name: Download Windows build (AVX2)
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: maszyna-windows-x64-${{ env.CONFIG_WIN }}
|
name: maszyna-windows-x64-avx2-${{ env.CONFIG_WIN }}
|
||||||
path: dist/maszyna-windows-x64
|
path: dist/maszyna-windows-x64
|
||||||
|
|
||||||
- name: Download Linux build
|
- name: Download Windows build (no AVX2)
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: maszyna-linux-x64-${{ env.CONFIG_LINUX }}
|
name: maszyna-windows-x64-noavx2-${{ env.CONFIG_WIN }}
|
||||||
|
path: dist/maszyna-windows-x64-noavx2
|
||||||
|
|
||||||
|
- name: Download Linux build (AVX2)
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
|
with:
|
||||||
|
name: maszyna-linux-x64-avx2-${{ env.CONFIG_LINUX }}
|
||||||
path: dist/maszyna-linux-x64
|
path: dist/maszyna-linux-x64
|
||||||
|
|
||||||
|
- name: Download Linux build (no AVX2)
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
|
with:
|
||||||
|
name: maszyna-linux-x64-noavx2-${{ env.CONFIG_LINUX }}
|
||||||
|
path: dist/maszyna-linux-x64-noavx2
|
||||||
|
|
||||||
- name: Pack
|
- name: Pack
|
||||||
run: |
|
run: |
|
||||||
cd dist
|
cd dist
|
||||||
|
|
||||||
find maszyna-linux-x64 -type f -exec sh -c 'file -b "$1" | grep -q "^ELF" && chmod +x "$1"' _ {} \;
|
# the artifacts lose the executable bit
|
||||||
if [ -d maszyna-linux-x64/linuxpython64/bin ]; then
|
for dir in maszyna-linux-x64 maszyna-linux-x64-noavx2; do
|
||||||
chmod +x maszyna-linux-x64/linuxpython64/bin/*
|
find "$dir" -type f -exec sh -c 'file -b "$1" | grep -q "^ELF" && chmod +x "$1"' _ {} \;
|
||||||
fi
|
if [ -d "$dir/linuxpython64/bin" ]; then
|
||||||
|
chmod +x "$dir"/linuxpython64/bin/*
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
(cd maszyna-windows-x64 && zip -qr9 ../maszyna-windows-x64.zip .)
|
(cd maszyna-windows-x64 && zip -qr9 ../maszyna-windows-x64.zip .)
|
||||||
|
(cd maszyna-windows-x64-noavx2 && zip -qr9 ../maszyna-windows-x64-noavx2.zip .)
|
||||||
tar -czf maszyna-linux-x64.tar.gz -C maszyna-linux-x64 .
|
tar -czf maszyna-linux-x64.tar.gz -C maszyna-linux-x64 .
|
||||||
|
tar -czf maszyna-linux-x64-noavx2.tar.gz -C maszyna-linux-x64-noavx2 .
|
||||||
ls -la
|
ls -la
|
||||||
|
|
||||||
- name: Publish rolling release of the branch
|
- name: Publish rolling release of the branch
|
||||||
@@ -422,14 +468,18 @@ jobs:
|
|||||||
"" \
|
"" \
|
||||||
"Download without a GitHub account:" \
|
"Download without a GitHub account:" \
|
||||||
"- Windows: $base/maszyna-windows-x64.zip" \
|
"- Windows: $base/maszyna-windows-x64.zip" \
|
||||||
|
"- Windows, CPUs without AVX2 (older than Haswell, 2013): $base/maszyna-windows-x64-noavx2.zip" \
|
||||||
"- Linux: $base/maszyna-linux-x64.tar.gz" \
|
"- Linux: $base/maszyna-linux-x64.tar.gz" \
|
||||||
|
"- Linux, CPUs without AVX2: $base/maszyna-linux-x64-noavx2.tar.gz" \
|
||||||
"" \
|
"" \
|
||||||
"Unpack over a MaSzyna installation (the game data isn't included). Build log: $RUN_URL")"
|
"Unpack over a MaSzyna installation (the game data isn't included). Build log: $RUN_URL")"
|
||||||
|
|
||||||
gh release delete "$tag" --yes --cleanup-tag || true
|
gh release delete "$tag" --yes --cleanup-tag || true
|
||||||
gh release create "$tag" \
|
gh release create "$tag" \
|
||||||
dist/maszyna-windows-x64.zip \
|
dist/maszyna-windows-x64.zip \
|
||||||
|
dist/maszyna-windows-x64-noavx2.zip \
|
||||||
dist/maszyna-linux-x64.tar.gz \
|
dist/maszyna-linux-x64.tar.gz \
|
||||||
|
dist/maszyna-linux-x64-noavx2.tar.gz \
|
||||||
--target "$SHA" \
|
--target "$SHA" \
|
||||||
--prerelease \
|
--prerelease \
|
||||||
--latest=false \
|
--latest=false \
|
||||||
@@ -438,4 +488,6 @@ jobs:
|
|||||||
|
|
||||||
echo "### Public download" >> "$GITHUB_STEP_SUMMARY"
|
echo "### Public download" >> "$GITHUB_STEP_SUMMARY"
|
||||||
echo "- Windows: $base/maszyna-windows-x64.zip" >> "$GITHUB_STEP_SUMMARY"
|
echo "- Windows: $base/maszyna-windows-x64.zip" >> "$GITHUB_STEP_SUMMARY"
|
||||||
|
echo "- Windows, no AVX2: $base/maszyna-windows-x64-noavx2.zip" >> "$GITHUB_STEP_SUMMARY"
|
||||||
echo "- Linux: $base/maszyna-linux-x64.tar.gz" >> "$GITHUB_STEP_SUMMARY"
|
echo "- Linux: $base/maszyna-linux-x64.tar.gz" >> "$GITHUB_STEP_SUMMARY"
|
||||||
|
echo "- Linux, no AVX2: $base/maszyna-linux-x64-noavx2.tar.gz" >> "$GITHUB_STEP_SUMMARY"
|
||||||
|
|||||||
@@ -475,6 +475,11 @@ if (ADD_VERSION_SUFFIX)
|
|||||||
set (SUFFIX "_${SRC_SHORT_DATE}_${GIT_HASH}")
|
set (SUFFIX "_${SRC_SHORT_DATE}_${GIT_HASH}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# a build without AVX2 says so in its name, so a starter can pick it on a CPU without AVX2
|
||||||
|
if (NOT ENABLE_AVX2)
|
||||||
|
set (SUFFIX "${SUFFIX}_noavx2")
|
||||||
|
endif()
|
||||||
|
|
||||||
set(OPENVR_LIBRARY "openvr_api")
|
set(OPENVR_LIBRARY "openvr_api")
|
||||||
set(OPENVR_INCLUDE_DIR "")
|
set(OPENVR_INCLUDE_DIR "")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user