Skip to content

Commit

Permalink
tmp
Browse files Browse the repository at this point in the history
  • Loading branch information
pichi-router committed Jan 14, 2025
1 parent 1ab72ae commit 0d0a33d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install Conan on macOS
if: ${{ inputs.image == 'macos-12' }}
run: brew install conan
if: ${{ inputs.image == 'macos-14' }}
run: brew install conan go
- name: Install Conan on non-macOS
if: ${{ inputs.image != 'macos-12' }}
if: ${{ inputs.image != 'macos-14' }}
uses: turtlebrowser/get-conan@v1.1
- name: Install NASM for windows
if: ${{ inputs.os == 'windows' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ jobs:
macos:
uses: ./.github/workflows/conan.yml
with:
image: macos-12
image: macos-14
os: ios
args: -a armv8 -v 17.0
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ jobs:
macos:
uses: ./.github/workflows/conan.yml
with:
image: macos-12
image: macos-14
os: macos

0 comments on commit 0d0a33d

Please sign in to comment.