diff options
author | Baruch Sterin <baruchs@gmail.com> | 2022-01-23 00:16:10 +0100 |
---|---|---|
committer | Baruch Sterin <baruchs@gmail.com> | 2022-01-23 00:23:52 +0100 |
commit | 0a536417f6be75fcf26720767a61bd1f57a685b5 (patch) | |
tree | 30082be55cdf1072d3a7e02017aa947df3ab72cb /.github | |
parent | 2ccb0f783495a65cc597865ba24556cc64b8eaa1 (diff) | |
download | abc-0a536417f6be75fcf26720767a61bd1f57a685b5.tar.gz abc-0a536417f6be75fcf26720767a61bd1f57a685b5.tar.bz2 abc-0a536417f6be75fcf26720767a61bd1f57a685b5.zip |
Build CMake on GitHub Actions
Also, resolve CMake build problems on macOS:
Pass CMAKE_OSX_SYSROOT as an environment variable SDKROOT when buildind the arch_flags executable.
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/build-posix-cmake.yml | 6 | ||||
-rw-r--r-- | .github/workflows/build-posix.yml (renamed from .github/disabled-workflows/build-posix.yml) | 0 | ||||
-rw-r--r-- | .github/workflows/build-windows.yml (renamed from .github/disabled-workflows/build-windows.yml) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/build-posix-cmake.yml b/.github/workflows/build-posix-cmake.yml index 68d325b2..ea31fe0b 100644 --- a/.github/workflows/build-posix-cmake.yml +++ b/.github/workflows/build-posix-cmake.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} env: - MAKE_ARGS: ${{ matrix.use_namespace && '-DABC_USE_NAMESPACE=ON' || '' }} + CMAKE_ARGS: ${{ matrix.use_namespace && '-DABC_USE_NAMESPACE=xxx' || '' }} DEMO_ARGS: ${{ matrix.use_namespace && '-DABC_NAMESPACE=xxx' || '' }} DEMO_GCC: ${{ matrix.use_namespace && 'g++ -x c++' || 'gcc' }} @@ -34,7 +34,7 @@ jobs: - name: Configure CMake run: | - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -B build + cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${CMAKE_ARGS} -B build - name: Build CMake run: | @@ -53,7 +53,7 @@ jobs: - name: Stage Executable run: | mkdir staging - cp abc libabc.a staging/ + cp build/abc build/libabc.a staging/ - name: Upload pacakge artifact uses: actions/upload-artifact@v1 diff --git a/.github/disabled-workflows/build-posix.yml b/.github/workflows/build-posix.yml index aa97aca2..aa97aca2 100644 --- a/.github/disabled-workflows/build-posix.yml +++ b/.github/workflows/build-posix.yml diff --git a/.github/disabled-workflows/build-windows.yml b/.github/workflows/build-windows.yml index 6312780d..6312780d 100644 --- a/.github/disabled-workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml |