Skip to content

Commit

Permalink
修复 macos 编译出错的问题 --filter=[macos-aarch64][macos-x86_64]
Browse files Browse the repository at this point in the history
  • Loading branch information
matyhtf committed Oct 24, 2024
1 parent 7e9bb79 commit 170bf04
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [ push, pull_request ]

jobs:
linux-aarch64:
if: 1
if: "!contains(github.event.head_commit.message, '--filter=') || contains(github.event.head_commit.message, '[linux-aarch64]')"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [ push, pull_request ]

jobs:
linux-x86_64:
if: 1
if: "!contains(github.event.head_commit.message, '--filter=') || contains(github.event.head_commit.message, '[linux-x86_64]')"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos-aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [ push, pull_request ]

jobs:
macos-aarch64:
if: 1
if: "!contains(github.event.head_commit.message, '--filter=') || contains(github.event.head_commit.message, '[macos-aarch64]')"
runs-on: macos-14
# macos-latest (macos-14) 变更了 CPU 架构,由 x86_64 变更为 arm64
# macos-14 CPU 架构 arm64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [ push, pull_request ]

jobs:
macos-x86_64:
if: 1
if: "!contains(github.event.head_commit.message, '--filter=') || contains(github.event.head_commit.message, '[macos-x86_64]')"
runs-on: macos-13
# macos-latest (macos-14) 变更了 CPU 架构,由 x86_64 变更为 arm64
# macos-14 CPU 架构 arm64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-cygwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [ push, pull_request ]

jobs:
windows-cygwin:
if: 1
if: "!contains(github.event.head_commit.message, '--filter=') || contains(github.event.head_commit.message, '[windows-cygwin]')"
runs-on: windows-latest
steps:
- name: Prepare git
Expand Down
2 changes: 1 addition & 1 deletion prepare.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}

if ($p->isMacos()) {
$p->setExtraLdflags('-undefined dynamic_lookup');
$p->setExtraLdflags('-fopenmp');
$homebrew_prefix = trim(shell_exec('brew --prefix'));
$p->withBinPath($homebrew_prefix . '/opt/llvm/bin')
->withBinPath($homebrew_prefix . '/opt/flex/bin')
Expand Down

0 comments on commit 170bf04

Please sign in to comment.