From 451dab75c320c2261c8a2ae61057dcd9c64c2b8e Mon Sep 17 00:00:00 2001 From: bitswype Date: Wed, 23 Oct 2024 14:22:42 -0700 Subject: [PATCH] Update build.yml Builds were failing due to an outdated github CI call. Updated to the latest from https://github.com/saleae/SampleAnalyzer/blob/master/.github/workflows/build.yml --- .github/workflows/build.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31c9305..90b001d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,13 +28,20 @@ jobs: - uses: actions/checkout@v2 - name: Build run: | - cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Release - cmake --build ${{github.workspace}}/build - - name: Upload MacOS build + cmake -B ${{github.workspace}}/build/x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=x86_64 + cmake --build ${{github.workspace}}/build/x86_64 + cmake -B ${{github.workspace}}/build/arm64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64 + cmake --build ${{github.workspace}}/build/arm64 + - name: Upload MacOS x86_64 build uses: actions/upload-artifact@v2 with: - name: macos - path: ${{github.workspace}}/build/Analyzers/*.so + name: macos_x86_64 + path: ${{github.workspace}}/build/x86_64/Analyzers/*.so + - name: Upload MacOS arm64 build + uses: actions/upload-artifact@v2 + with: + name: macos_arm64 + path: ${{github.workspace}}/build/arm64/Analyzers/*.so linux: runs-on: ubuntu-latest steps: @@ -43,6 +50,9 @@ jobs: run: | cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Release cmake --build ${{github.workspace}}/build + env: + CC: gcc-10 + CXX: g++-10 - name: Upload Linux build uses: actions/upload-artifact@v2 with: @@ -68,4 +78,4 @@ jobs: uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') with: - files: ${{github.workspace}}/analyzer.zip \ No newline at end of file + files: ${{github.workspace}}/analyzer.zip