Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
shunk031 committed Mar 2, 2024
1 parent 395fbfb commit a4a2a8b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:

jobs:
build:
runs-on: macOS-14 # M1 Mac
runs-on: macos-14 # M1 Mac

steps:
- name: Setup dotfiles
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/remote.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
build:
strategy:
matrix:
os: [ubuntu-latest, macOS-14]
os: [ubuntu-latest, macos-14]
system: [client, server]
exclude:
- os: macOS-14
- os: macos-14
system: server

runs-on: ${{ matrix.os }}
Expand All @@ -23,7 +23,7 @@ jobs:
OS: ${{ matrix.os }}
SYSTEM: ${{ matrix.system }}
run: |
if [ "${OS}" == "macOS-14" ]; then
if [ "${OS}" == "macos-14" ]; then
printf '${EMAIL_ADDRESS}\n' | bash -c "$(curl -fsLS https://shunk031.me/dotfiles/setup.sh)"
# │
# └─ Simulate inputting an email address into the chezmoi's config.
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
test:
strategy:
matrix:
os: [ubuntu-latest, macOS-14]
os: [ubuntu-latest, macos-14]
system: [client, server]
exclude:
- os: macOS-14
- os: macos-14
system: server

runs-on: ${{ matrix.os }}
Expand All @@ -26,7 +26,7 @@ jobs:

- name: Install tools
run: |
if [ "${OS}" == "macOS-14" ]; then
if [ "${OS}" == "macos-14" ]; then
brew install bats-core kcov parallel
elif [ "${OS}" == "ubuntu-latest" ]; then
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Set flag for codecov
run: |
if [ "${OS}" == "macOS-14" ]; then
if [ "${OS}" == "macos-14" ]; then
echo "flags=${OS}" >> $GITHUB_ENV
elif [ "${OS}" == "ubuntu-latest" ]; then
echo "flags=${OS}-${SYSTEM}" >> $GITHUB_ENV
Expand Down
4 changes: 2 additions & 2 deletions scripts/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function run_common_test() {
}

function run_os_specific_test() {
if [ "${OS}" == "macOS-latest" ]; then
if [ "${OS}" == "macos-14" ]; then
kcov --clean \
--debug-force-bash-stderr \
--include-path=install/macos/common/ \
Expand All @@ -31,7 +31,7 @@ function run_os_specific_test() {
}

function merge_coverage_results() {
if [ "${OS}" == "macOS-latest" ]; then
if [ "${OS}" == "macos-14" ]; then
kcov --merge "./coverage" \
"./coverage_common" \
"./coverage_macos_common"
Expand Down

0 comments on commit a4a2a8b

Please sign in to comment.