diff options
| author | Yong He <yonghe@outlook.com> | 2024-04-24 15:51:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 15:51:43 -0700 |
| commit | fc4c242442510fb97c3cfbf04d7582ebbc3bb0ed (patch) | |
| tree | 0c19f6974dad99cbe1faa24b1aba41d0780008da /.github | |
| parent | 211b2ffc20d7798cab0b8483ccc3ec2b7ade49ab (diff) | |
Fix macos CI and clang warnings. (#4019)
* Fix macos CI.
* Fix.
* Fix.
* Fix.
* Fix clang warnings.
* Fix more warnings.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/github_test.sh | 4 | ||||
| -rw-r--r-- | .github/workflows/macos.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/release-macos.yml | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/.github/github_test.sh b/.github/github_test.sh index ec6586114..5e75296fb 100644 --- a/.github/github_test.sh +++ b/.github/github_test.sh @@ -18,6 +18,10 @@ if [ "${ARCHITECTURE}" == "x86_64" ]; then ARCHITECTURE="x64" fi +if [ "${ARCHITECTURE}" == "arm64" ]; then + ARCHITECTURE="aarch64" +fi + # CONFIGURATION=release or debug if [ "${CC}" == "gcc" ] && [ "${CONFIGURATION}" == "release" ] && [ "${ARCHITECTURE}" == "x64" ] then diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 30a3fe003..7bb5b9651 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -17,8 +17,8 @@ jobs: matrix: configuration: ['release'] # 'debug' compiler: ['clang'] - platform: ['x64'] - targetPlatform: ['x64'] + platform: ['aarch64'] + targetPlatform: ['aarch64'] steps: - uses: actions/checkout@v3 with: @@ -64,7 +64,7 @@ jobs: path: | ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE }} - name: test - if: ${{ matrix.targetPlatform != 'aarch64' }} + if: ${{ matrix.targetPlatform != 'x64' }} run: CONFIGURATION=${{matrix.configuration}} CC=${{matrix.compiler}} diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index bd3751e81..6bae8773a 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -14,7 +14,7 @@ jobs: matrix: configuration: ['release'] # 'debug' compiler: ['clang'] - platform: ['x64'] + platform: ['aarch64'] targetPlatform: ['x64', 'aarch64'] steps: - name: Checkout code |