Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 25 additions & 20 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
---
name: CI
on:
- push
- pull_request
push:
branches:
- main
- stable/*
pull_request:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
Expand All @@ -12,16 +15,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.13"
python-version: "3.14"
cache: 'pip'
- name: Set up Go
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version: "1.21"
go-version: "1.26"
- name: Install dependencies
run: python -m pip install tox
- name: Run tox
Expand All @@ -33,7 +36,7 @@ jobs:
matrix:
# NOTE: If you add a version here, don't forget to update the
# '[gh-actions]' section in tox.ini
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
python: ["3.11", "3.14"]
db: [postgres, mysql, sqlite3]
env:
DATABASE_TYPE: "${{ matrix.db }}"
Expand All @@ -44,7 +47,7 @@ jobs:
MYSQL_ROOT_PASSWORD: root-${{ github.run_id }}
services:
postgres:
image: postgres:latest
image: postgres:17
env:
POSTGRES_DB: ${{ env.DATABASE_NAME }}
POSTGRES_PASSWORD: ${{ env.DATABASE_PASSWORD }}
Expand All @@ -57,7 +60,7 @@ jobs:
--health-timeout 5s
--health-retries 5
mysql:
image: mysql:latest
image: mysql:8.4
env:
MYSQL_DATABASE: ${{ env.DATABASE_NAME }}
MYSQL_USER: ${{ env.DATABASE_USER }}
Expand All @@ -72,9 +75,9 @@ jobs:
--health-retries 5
steps:
- name: Checkout source code
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python }}
cache: 'pip'
Expand Down Expand Up @@ -104,20 +107,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Fetch all branches
run: git fetch --all
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.13"
python-version: "3.14"
cache: 'pip'
- name: Install dependencies
run: python -m pip install tox
- name: Build docs (via tox)
run: tox -e docs
- name: Archive build results
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: html-docs-build
path: docs/_build/html
Expand All @@ -132,13 +137,13 @@ jobs:
COMPOSE_FILE: ${{ matrix.db == 'mysql' && 'docker-compose.yml' || (matrix.db == 'postgres' && 'docker-compose-pg.yml') || 'docker-compose-sqlite3.yml' }}
steps:
- name: Checkout source code
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.13"
python-version: "3.14"
cache: 'pip'
- name: Build docker-compose service
run: |
Expand All @@ -151,7 +156,7 @@ jobs:
{ echo patchwork; echo patchwork; } | \
docker compose run -T --rm web \
python manage.py changepassword patchwork
# FIXME(stephenfin): Re-enable this once dbbackup supports Django 4.0
# FIXME(stephenfin): Re-enable this once we've update configuration accordingly
# - name: Test dbbackup/dbrestore
# run: |
# docker compose run -T --rm web python manage.py dbbackup
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
rev: v6.0.0
hooks:
- id: check-executables-have-shebangs
- id: check-merge-conflict
Expand All @@ -11,15 +11,15 @@ repos:
- id: trailing-whitespace
exclude: (.*\.mbox)|(.*\.svg)
- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.5.5
rev: v1.5.6
hooks:
- id: remove-tabs
exclude: (.*\.mbox)|(.*\.svg)|(.*\.sql)|(.*\.conf)
- id: remove-crlf
exclude: (.*\.mbox)|(.*\.svg)
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.9.10
rev: v0.15.16
hooks:
# Run the linter.
- id: ruff
Expand All @@ -30,7 +30,7 @@ repos:
hooks:
- id: bashate
- repo: https://github.com/daveshanley/vacuum
rev: v0.16.3
rev: v0.29.2
hooks:
- id: vacuum
files: ^docs/api/schemas/(latest|v\d\.\d)/patchwork.yaml
2 changes: 1 addition & 1 deletion docker-compose-pg.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
services:
db:
image: postgres:latest
image: postgres:17
volumes:
- ./tools/docker/db/postdata:/var/lib/postgresql/data
environment:
Expand Down
Loading
Loading