diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 74ffe223a9..3b127557dd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,9 +17,9 @@ jobs: fail-fast: false matrix: os: - - ubuntu - - windows - - macos + - ["ubuntu", "ubuntu-20.04"] + - ["windows", "windows-latest"] + - ["macos", "macos-latest"] config: # [Python version, tox env] - ["3.9", "lint"] @@ -32,19 +32,19 @@ jobs: - ["3.9", "docs"] - ["3.9", "coverage"] exclude: - - { os: windows, config: ["3.9", "lint"] } - - { os: windows, config: ["3.9", "docs"] } - - { os: windows, config: ["3.9", "coverage"] } - - { os: macos, config: ["3.9", "lint"] } - - { os: macos, config: ["3.9", "docs"] } - - { os: macos, config: ["3.9", "coverage"] } + - { os: ["windows", "windows-latest"], config: ["3.9", "lint"] } + - { os: ["windows", "windows-latest"], config: ["3.9", "docs"] } + - { os: ["windows", "windows-latest"], config: ["3.9", "coverage"] } + - { os: ["macos", "macos-latest"], config: ["3.9", "lint"] } + - { os: ["macos", "macos-latest"], config: ["3.9", "docs"] } + - { os: ["macos", "macos-latest"], config: ["3.9", "coverage"] } # macOS/Python 3.11 is set up for universal2 architecture # which causes build and package selection issues. - - { os: macos, config: ["3.11", "py311"] } + - { os: ["macos", "macos-latest"], config: ["3.11", "py311"] } - runs-on: ${{ matrix.os }}-latest + runs-on: ${{ matrix.os[1] }} if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name - name: ${{ matrix.os }}-${{ matrix.config[1] }} + name: ${{ matrix.os[0] }}-${{ matrix.config[1] }} steps: - uses: actions/checkout@v3 - name: Set up Python diff --git a/.meta.toml b/.meta.toml index d604b33d41..b5f4634e03 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/zope-product [meta] template = "zope-product" -commit-id = "342271a70d886e753e5cc629e8a81b3cfab692ac" +commit-id = "931ebd36c89bffdc929019c5080086ed7a45b5d6" [python] with-pypy = false