AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-11-08 19:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2991 from KhronosGroup/revert-2988-build_arm64_binaries_mac

Browse Source 
Revert "Fix: Build arm64 binaries for macOS"
This commit is contained in:
Greg Fischer 2022-08-03 13:22:21 -06:00 committed by GitHub
commit adf7bf0113
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/continuous_deployment.yml vendored
View File

@ -106,7 +106,6 @@ jobs:
matrix: matrix:
os: [{genus: macos-11, family: osx}] os: [{genus: macos-11, family: osx}]
compiler: [{cc: clang, cxx: clang++}] compiler: [{cc: clang, cxx: clang++}]
arch: [x86_64, arm64]
cmake_build_type: [Debug, Release] cmake_build_type: [Debug, Release]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -134,7 +133,7 @@ jobs:
CXX: ${{matrix.compiler.cxx}} CXX: ${{matrix.compiler.cxx}}
run: | run: |
mkdir build && cd build 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 make -j4 install
- name: Test - name: Test
run: | run: |
@ -143,7 +142,7 @@ jobs:
cd ../Test && ./runtests cd ../Test && ./runtests
- name: Zip - name: Zip
env: 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: | run: |
cd build/install cd build/install
zip ${ARCHIVE} \ zip ${ARCHIVE} \
@ -163,7 +162,7 @@ jobs:
lib/libSPIRV-Tools-opt.a lib/libSPIRV-Tools-opt.a
- name: Deploy - name: Deploy
env: 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 uses: actions/github-script@v5
with: with:
script: | script: |