diff options
| author | Yong He <yonghe@outlook.com> | 2022-09-28 20:03:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-28 20:03:18 -0700 |
| commit | b01d8db282f7971ade728e47a943585eae42f419 (patch) | |
| tree | 166a01ba9eb96841ee058c2470f9aa26f9c331cd /.github | |
| parent | 3dce6e08dd74c6dfbfb8f553eaf18200a6bf6f2a (diff) | |
Fix build script for macos aarch64. (#2420)
* Fix build script for macos aarch64.
* fix1
* Fix2.
* update vs files
Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/macos.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 68214d525..aadf17bc8 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -16,6 +16,7 @@ jobs: configuration: ['release'] # 'debug' compiler: ['clang'] platform: ['x64'] + targetPlatform: ['x64', 'aarch64'] steps: - uses: actions/checkout@v2.3.4 with: @@ -26,7 +27,7 @@ jobs: CC=${{matrix.compiler}} CONFIGURATION=${{matrix.configuration}} ARCH=${{matrix.platform}} - TARGETARCH=${{matrix.platform}} + TARGETARCH=${{matrix.targetPlatform}} CPPFLAGS=-Werror CFLAGS=-Werror CXXFLAGS=-Werror @@ -35,7 +36,7 @@ jobs: id: package run: | export SLANG_OS_NAME=macos - export SLANG_ARCH_NAME=`uname -p` + export SLANG_ARCH_NAME=${{matrix.targetPlatform}} export TAG_NAME=`git describe --tags` export SLANG_TAG=${TAG_NAME#v} echo "tag:$TAG_NAME" @@ -54,12 +55,13 @@ jobs: echo "::set-output name=SLANG_BINARY_ARCHIVE::${SLANG_BINARY_ARCHIVE}" - uses: actions/upload-artifact@v3 with: - name: slang-build-${{matrix.configuration}}-${{matrix.platform}}-${{matrix.compiler}} + name: slang-build-${{matrix.configuration}}-${{matrix.targetPlatform}}-${{matrix.compiler}} path: | ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE }} - name: test + if: ${{ matrix.targetPlatform != 'aarch64' }} run: CONFIGURATION=${{matrix.configuration}} CC=${{matrix.compiler}} - ARCH=${{matrix.platform}} + ARCH=${{matrix.targetPlatform}} source ./github_test.sh |