From a683dcb630589c932741ac2c2f4e93b4391bac0f Mon Sep 17 00:00:00 2001 From: hugsy Date: Sat, 9 Mar 2024 16:37:33 -0800 Subject: [PATCH 1/3] ci build linux/x86 --- .github/workflows/build.yml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 75b2b3f..2ff292f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,8 +28,8 @@ jobs: - {os: windows-2022, arch: win32, config: RelWithDebInfo} - {os: windows-2022, arch: arm64, config: RelWithDebInfo} - {os: windows-2022, arch: arm, config: RelWithDebInfo} - # - {os: ubuntu-2204, arch: x64, config: RelWithDebInfo} # runner fails for some reason, works fine locally: see https://github.com/actions/runner-images/discussions/7188 - # - {os: ubuntu-2204, arch: x86, config: RelWithDebInfo} + - {os: ubuntu-2204, arch: x64, config: RelWithDebInfo} # runner fails for some reason, works fine locally: see https://github.com/actions/runner-images/discussions/7188 + - {os: ubuntu-2204, arch: x86, config: RelWithDebInfo} runs-on: ${{ matrix.variants.os }} outputs: @@ -37,8 +37,8 @@ jobs: windows-2022-win32: ${{ join(steps.*.outputs.windows-2022-win32,'') }} windows-2022-arm: ${{ join(steps.*.outputs.windows-2022-arm,'') }} windows-2022-arm64: ${{ join(steps.*.outputs.windows-2022-arm64,'') }} - # ubuntu-2204-x64: ${{ join(steps.*.outputs.ubuntu-2204-x64,'') }} - # ubuntu-2204-x86: ${{ join(steps.*.outputs.ubuntu-2204-x86,'') }} + ubuntu-2204-x64: ${{ join(steps.*.outputs.ubuntu-2204-x64,'') }} + ubuntu-2204-x86: ${{ join(steps.*.outputs.ubuntu-2204-x86,'') }} steps: - uses: actions/checkout@v4 @@ -58,10 +58,22 @@ jobs: wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh chmod +x /tmp/llvm.sh sudo /tmp/llvm.sh 17 - sudo apt update && sudo apt install -y cmake doxygen clang-17 libc++abi-17-dev libc++-17-dev llvm-17-dev nasm + sudo apt update && sudo apt install -y cmake doxygen clang-17 libc++abi-17-dev libc++-17-dev llvm-17-dev nasm gcc-multilib g++-multilib echo "NB_CPU=$(grep -c ^processor /proc/cpuinfo)" >> $GITHUB_ENV - echo "CC=clang-17" >> $GITHUB_ENV - echo "CXX=clang++-17" >> $GITHUB_ENV + case "${{ matrix.variants.arch }}" in + x86) + echo "CC=clang-17 -m32" >> $GITHUB_ENV + echo "CXX=clang++-17 -m32" >> $GITHUB_ENV + ;; + x64) + echo "CC=clang-17" >> $GITHUB_ENV + echo "CXX=clang++-17" >> $GITHUB_ENV + ;; + *) + echo "Invalid architecture" + exit 1 + ;; + esac - name: Prepare common environment run: | From 9e43e87de5a46e311d4557e220aea2efe1e85c5e Mon Sep 17 00:00:00 2001 From: hugsy Date: Sat, 9 Mar 2024 16:43:47 -0800 Subject: [PATCH 2/3] baby steps --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ff292f..813415b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,8 +28,8 @@ jobs: - {os: windows-2022, arch: win32, config: RelWithDebInfo} - {os: windows-2022, arch: arm64, config: RelWithDebInfo} - {os: windows-2022, arch: arm, config: RelWithDebInfo} - - {os: ubuntu-2204, arch: x64, config: RelWithDebInfo} # runner fails for some reason, works fine locally: see https://github.com/actions/runner-images/discussions/7188 - - {os: ubuntu-2204, arch: x86, config: RelWithDebInfo} + - {os: ubuntu-22.04, arch: x64, config: RelWithDebInfo} # runner fails for some reason, works fine locally: see https://github.com/actions/runner-images/discussions/7188 + - {os: ubuntu-22.04, arch: x86, config: RelWithDebInfo} runs-on: ${{ matrix.variants.os }} outputs: @@ -37,8 +37,8 @@ jobs: windows-2022-win32: ${{ join(steps.*.outputs.windows-2022-win32,'') }} windows-2022-arm: ${{ join(steps.*.outputs.windows-2022-arm,'') }} windows-2022-arm64: ${{ join(steps.*.outputs.windows-2022-arm64,'') }} - ubuntu-2204-x64: ${{ join(steps.*.outputs.ubuntu-2204-x64,'') }} - ubuntu-2204-x86: ${{ join(steps.*.outputs.ubuntu-2204-x86,'') }} + ubuntu-22.04-x64: ${{ join(steps.*.outputs.ubuntu-22.04-x64,'') }} + ubuntu-22.04-x86: ${{ join(steps.*.outputs.ubuntu-22.04-x86,'') }} steps: - uses: actions/checkout@v4 @@ -153,7 +153,7 @@ jobs: path: artifact/ # notify: - # runs-on: ubuntu-2204 + # runs-on: ubuntu-22.04 # needs: build # steps: # - name: Send Discord notification From f68843a0a96113e19ff5b7e6ff7c97477810a24f Mon Sep 17 00:00:00 2001 From: hugsy Date: Sat, 9 Mar 2024 16:46:01 -0800 Subject: [PATCH 3/3] more baby steps --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 813415b..938eb80 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,8 +37,8 @@ jobs: windows-2022-win32: ${{ join(steps.*.outputs.windows-2022-win32,'') }} windows-2022-arm: ${{ join(steps.*.outputs.windows-2022-arm,'') }} windows-2022-arm64: ${{ join(steps.*.outputs.windows-2022-arm64,'') }} - ubuntu-22.04-x64: ${{ join(steps.*.outputs.ubuntu-22.04-x64,'') }} - ubuntu-22.04-x86: ${{ join(steps.*.outputs.ubuntu-22.04-x86,'') }} + # ubuntu-2204-x64: ${{ join(steps.*.outputs.ubuntu-2204-x64,'') }} + # ubuntu-2204-x86: ${{ join(steps.*.outputs.ubuntu-2204-x86,'') }} steps: - uses: actions/checkout@v4