From adc4d4332cb33a8630b9c6aa2d58c14a6b45c86d Mon Sep 17 00:00:00 2001 From: Kenjiro Nakayama Date: Mon, 25 Mar 2024 15:51:24 +0900 Subject: Revert "Split the jobs into two files, macOS and macOS-legacy." This reverts commit 51e6f0ec5a9e3c68ec610d47d6a915b61e8f6a85. --- .github/workflows/macos-legacy.yml | 37 ------------------------------------- .github/workflows/macos.yml | 2 +- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 .github/workflows/macos-legacy.yml 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 @@ -# GitHub Actions workflow to run tests on macOS. -name: "macOS-legacy" - -on: - push: {} - pull_request: {} - schedule: - - cron: "0 0 * * 0" # At 00:00 weekly on Sunday. - -concurrency: - group: "${{ github.workflow }}-${{ github.ref }}" - cancel-in-progress: true - -jobs: - test: - name: "${{ matrix.os }}/${{ matrix.arch }}" - runs-on: "${{ matrix.os }}" - if: ${{ github.repository_owner == 'libressl' || github.event_name != 'schedule' }} - permissions: - contents: read - strategy: - fail-fast: false - matrix: - os: ["macos-13", "macos-12"] - arch: ["arm64", "x86_64"] - steps: - - name: "Install required packages" - run: brew install automake - - - name: "Checkout repository" - uses: actions/checkout@v4 - - - name: "Run tests" - run: ./scripts/test - env: - ARCH: "${{ matrix.arch }}" - 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: strategy: fail-fast: false matrix: - os: ["macos-14"] + os: ["macos-14", "macos-13", "macos-12"] arch: ["arm64", "x86_64"] steps: - name: "Install required packages" -- cgit v1.2.3-55-g6feb