Merge pull request KhronosGroup#2991 from KhronosGroup/revert-2988-bu…

…ild_arm64_binaries_mac Revert "Fix: Build arm64 binaries for macOS"
RPCS3 · Aug 3, 2022 · adf7bf0 · adf7bf0
2 parents de0b1bf + d8b64c2
commit adf7bf0
Showing 1 changed file with 3 additions and 4 deletions.
diff --git 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: |