From 4c8967a37566599538c62623f54e8b11812d19c3 Mon Sep 17 00:00:00 2001 From: masklinn Date: Mon, 23 Oct 2023 17:48:04 +0200 Subject: [PATCH 1/3] Add cpython 3.12 and pypy:3.10, add prereleases to ci --- .github/workflows/ci.yml | 6 +++++- tox.ini | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 328c1fc0..a8b11d81 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,9 +78,12 @@ jobs: - "3.9" - "3.10" - "3.11" - - "3.12.0-alpha - 3.12" + - "3.12" + - "3.13" - "pypy-3.8" - "pypy-3.9" + - "pypy-3.10" + - "pypy-3.11" include: - source: sdist artifact: dist/*.tar.gz @@ -95,6 +98,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + allow-prereleases: true - name: Install test dependencies run: | python -mpip install --upgrade pip diff --git a/tox.ini b/tox.ini index e9162596..57b17f90 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,12 @@ [tox] min_version = 4.0 -env_list = py3{8,9,10,11} - pypy3.{8,9} +env_list = py3{8,9,10,11,12} + pypy3.{8,9,10} flake8, black labels = - test = py3{8,9,10,11},pypy3.{8,9} - cpy = py3{8,9,10,11} - pypy = pypy3.{8,9} + test = py3{8,9,10,11,12},pypy3.{8,9,10} + cpy = py3{8,9,10,11,12} + pypy = pypy3.{8,9,10} check = flake8, black [testenv] From f268d2f1fc3fc4dfc53d7f49e53c080391e2f709 Mon Sep 17 00:00:00 2001 From: masklinn Date: Mon, 23 Oct 2023 19:46:01 +0200 Subject: [PATCH 2/3] add weekly cron to CI, so it can run -next distributions --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8b11d81..1f67b3d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,11 @@ on: pull_request: branches: [ '*' ] workflow_dispatch: + schedule: + # cron is kinda random, assumes 22:00 UTC is a low ebb, eastern + # countries are very early morning, and US are mid-day to + # mid-afternoon + - cron: '0 22 * * 2' jobs: checks: From bf1010356722906e8854ca6820034279e46ecfa0 Mon Sep 17 00:00:00 2001 From: masklinn Date: Mon, 23 Oct 2023 20:03:33 +0200 Subject: [PATCH 3/3] Use continue on error for -next jobs ~~Apparently github's automerge is based on the job's properties not the branch protection rules.~~ From what I gather, seems to make the overall job succeed even if a specific run fails. This is exactly what we want. After checking again the selection was such a pain in the ass I got one of the status checks wrong in the ruleset, and selected one of the pypy-3.11 jobs as required. Even after `continue-on-error`-ing and the overall check now passing the branch still doesn't merge. `continue-on-error` seems like it's useful regardless, for better reporting, so leaving it. --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f67b3d9..63482c9d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,6 +71,7 @@ jobs: test: runs-on: ubuntu-latest needs: compile + continue-on-error: ${{ matrix.python-version == '3.13' || matrix.python-version == 'pypy-3.11' }} strategy: fail-fast: false matrix: