Skip to content

Commit

Permalink
Merge branch 'hartwork-fix-macos-cmake-ci'
Browse files Browse the repository at this point in the history
  • Loading branch information
rpodgorny committed Jun 16, 2024
2 parents a575aaa + d3d009e commit 9848411
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
clang_major_version: 18
runs-on: ubuntu-24.04
# macFUSE on macOS
- cc: gcc-13
- cc: gcc-12
clang_major_version: null
runs-on: macos-12
- cc: clang-15
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
brew install --cask macfuse
- name: Checkout Git branch
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- name: 'Configure with CMake'
run: |-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/makefile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
python3-pytest
- name: Checkout Git branch
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- name: 'Build and test (without coverage)'
run: |-
Expand Down

0 comments on commit 9848411

Please sign in to comment.