From e7d579c49c1e00275fc20d9dd619b5ae208928ff Mon Sep 17 00:00:00 2001 From: dekken Date: Sat, 28 Oct 2023 13:31:05 +0200 Subject: [PATCH] O2 mac + arm mac --- .github/workflows/release.yml | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 622f14e7..da6d8e87 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,14 +5,12 @@ on: workflow_dispatch: jobs: build: - # Build on Linux, Windows and MacOS strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - - if: matrix.os == 'windows-latest' run: bash -c "rm /bin/link" # interferes with cl/link.exe - if: matrix.os == 'windows-latest' @@ -28,7 +26,6 @@ jobs: bash -c ./res/ci/win_build.sh mkn build -dtKOg 0 -a "-std:c++17 -EHsc" - - if: matrix.os == 'ubuntu-latest' env: MKN_GCC_PREFERRED: 1 @@ -37,14 +34,12 @@ jobs: make nix KLOG=3 ./mkn build -dtKa "-std=c++17 -fPIC" -O 2 -g 0 -W 9 -o mkn_nix - - if: matrix.os == 'macos-latest' env: KUL_GIT_CO: --depth 1 run: | make bsd - KLOG=3 ./mkn build -dtKOW 9 -g 0 -a "-std=c++17 -fPIC" -o mkn_osx - + KLOG=3 ./mkn build -dtKW 9 -O 2 -g 0 -a "-std=c++17 -fPIC" -o mkn_osx - if: matrix.os == 'ubuntu-latest' uses: actions/upload-artifact@v3 @@ -76,15 +71,28 @@ jobs: - env: MKN_GCC_PREFERRED: 1 KUL_GIT_CO: --depth 1 - run: | - KLOG=3 ./mkn build -dtKa "-std=c++17 -fPIC" -O 2 -g 0 -W 9 -o mkn_manylinux - + run: KLOG=3 ./mkn build -dtKa "-std=c++17 -fPIC" -O 2 -g 0 -W 9 -o mkn_manylinux - uses: actions/upload-artifact@v3 with: name: maiken-manylinux-latest path: bin/build/mkn_manylinux retention-days: 1 + build_arm_macos: + runs-on: self-hosted + steps: + - uses: actions/checkout@v3 + - run: make bsd + - env: + MKN_GCC_PREFERRED: 1 + KUL_GIT_CO: --depth 1 + run: KLOG=3 ./mkn build -dtKa "-std=c++17 -fPIC" -O 2 -g 0 -W 9 -o mkn_arm_osx + - uses: actions/upload-artifact@v3 + with: + name: maiken-macos-arm-latest + path: bin/build/mkn_arm_osx + retention-days: 1 + release: name: "Prelease" @@ -105,4 +113,5 @@ jobs: maiken-windows-latest/mkn.exe maiken-macos-latest/mkn_osx maiken-ubuntu-latest/mkn_nix - maiken-manylinux-latest/mkn_manylinux + maiken-manylinux-latest/mkn_arm_osx + maiken-macos-arm-latest/