aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenjiro Nakayama <nakayamakenjiro@gmail.com>2024-03-25 15:51:24 +0900
committerKenjiro Nakayama <nakayamakenjiro@gmail.com>2024-03-25 15:51:24 +0900
commitadc4d4332cb33a8630b9c6aa2d58c14a6b45c86d (patch)
treebcdc05829a41c2b08988255621592a8532c08fd5
parent51e6f0ec5a9e3c68ec610d47d6a915b61e8f6a85 (diff)
downloadportable-adc4d4332cb33a8630b9c6aa2d58c14a6b45c86d.tar.gz
portable-adc4d4332cb33a8630b9c6aa2d58c14a6b45c86d.tar.bz2
portable-adc4d4332cb33a8630b9c6aa2d58c14a6b45c86d.zip
Revert "Split the jobs into two files, macOS and macOS-legacy."
This reverts commit 51e6f0ec5a9e3c68ec610d47d6a915b61e8f6a85.
-rw-r--r--.github/workflows/macos-legacy.yml37
-rw-r--r--.github/workflows/macos.yml2
2 files changed, 1 insertions, 38 deletions
diff --git a/.github/workflows/macos-legacy.yml b/.github/workflows/macos-legacy.yml
deleted file mode 100644
index f263423..0000000
--- a/.github/workflows/macos-legacy.yml
+++ /dev/null
@@ -1,37 +0,0 @@
1# GitHub Actions workflow to run tests on macOS.
2name: "macOS-legacy"
3
4on:
5 push: {}
6 pull_request: {}
7 schedule:
8 - cron: "0 0 * * 0" # At 00:00 weekly on Sunday.
9
10concurrency:
11 group: "${{ github.workflow }}-${{ github.ref }}"
12 cancel-in-progress: true
13
14jobs:
15 test:
16 name: "${{ matrix.os }}/${{ matrix.arch }}"
17 runs-on: "${{ matrix.os }}"
18 if: ${{ github.repository_owner == 'libressl' || github.event_name != 'schedule' }}
19 permissions:
20 contents: read
21 strategy:
22 fail-fast: false
23 matrix:
24 os: ["macos-13", "macos-12"]
25 arch: ["arm64", "x86_64"]
26 steps:
27 - name: "Install required packages"
28 run: brew install automake
29
30 - name: "Checkout repository"
31 uses: actions/checkout@v4
32
33 - name: "Run tests"
34 run: ./scripts/test
35 env:
36 ARCH: "${{ matrix.arch }}"
37 OS: "${{ matrix.os }}"
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 7874521..cd52d2c 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -21,7 +21,7 @@ jobs:
21 strategy: 21 strategy:
22 fail-fast: false 22 fail-fast: false
23 matrix: 23 matrix:
24 os: ["macos-14"] 24 os: ["macos-14", "macos-13", "macos-12"]
25 arch: ["arm64", "x86_64"] 25 arch: ["arm64", "x86_64"]
26 steps: 26 steps:
27 - name: "Install required packages" 27 - name: "Install required packages"