From d8b64c2713e8879d563632408e0918fe50f86dcb Mon Sep 17 00:00:00 2001 From: Greg Fischer Date: Wed, 3 Aug 2022 12:39:23 -0600 Subject: [PATCH] Revert "Fix: Build arm64 binaries for macOS" --- .github/workflows/continuous_deployment.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/continuous_deployment.yml b/.github/workflows/continuous_deployment.yml index 9b8f9a65..c375ac45 100644 --- a/.github/workflows/continuous_deployment.yml +++ b/.github/workflows/continuous_deployment.yml @@ -106,7 +106,6 @@ jobs: matrix: os: [{genus: macos-11, family: osx}] compiler: [{cc: clang, cxx: clang++}] - arch: [x86_64, arm64] cmake_build_type: [Debug, Release] steps: - uses: actions/checkout@v2 @@ -134,7 +133,7 @@ jobs: CXX: ${{matrix.compiler.cxx}} run: | mkdir build && cd build - cmake -DCMAKE_BUILD_TYPE=${{matrix.cmake_build_type}} -DCMAKE_INSTALL_PREFIX=`pwd`/install -DCMAKE_OSX_ARCHITECTURES=${{matrix.arch}} .. + cmake -DCMAKE_BUILD_TYPE=${{matrix.cmake_build_type}} -DCMAKE_INSTALL_PREFIX=`pwd`/install .. make -j4 install - name: Test run: | @@ -143,7 +142,7 @@ jobs: cd ../Test && ./runtests - name: Zip env: - ARCHIVE: glslang-master-${{matrix.os.family}}-${{matrix.arch}}-${{matrix.cmake_build_type}}.zip + ARCHIVE: glslang-master-${{matrix.os.family}}-${{matrix.cmake_build_type}}.zip run: | cd build/install zip ${ARCHIVE} \ @@ -163,7 +162,7 @@ jobs: lib/libSPIRV-Tools-opt.a - name: Deploy env: - ARCHIVE: glslang-master-${{matrix.os.family}}-${{matrix.arch}}-${{matrix.cmake_build_type}}.zip + ARCHIVE: glslang-master-${{matrix.os.family}}-${{matrix.cmake_build_type}}.zip uses: actions/github-script@v5 with: script: |