From a8ae78635afdcd9075e010e82c1bd0bacb2bd5da Mon Sep 17 00:00:00 2001 From: Sky Brewer Date: Fri, 20 Mar 2026 16:43:27 +0100 Subject: [PATCH 1/4] Update ci pipeline depends --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca90110..ffa140f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,9 +9,9 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 - - uses: pre-commit/action@v3.0.0 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + - uses: pre-commit/action@v3.0.1 build: runs-on: ubuntu-20.04 # 3.6 is not supported by Ubuntu 22.04 From 8e385b9bf7611e79eeed980f8a00a55c88048478 Mon Sep 17 00:00:00 2001 From: Sky Brewer Date: Fri, 20 Mar 2026 16:47:08 +0100 Subject: [PATCH 2/4] fix ci by using supported os --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ffa140f..7cd16ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,11 +14,11 @@ jobs: - uses: pre-commit/action@v3.0.1 build: - runs-on: ubuntu-20.04 # 3.6 is not supported by Ubuntu 22.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 @@ -37,7 +37,6 @@ jobs: fail-fast: false matrix: python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] # testcontainers is not supported on <3.9 - needs: build steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} From 4c8633c80d7e718741755b14aa4f9760de947eb4 Mon Sep 17 00:00:00 2001 From: Sky Brewer Date: Fri, 20 Mar 2026 18:19:16 +0100 Subject: [PATCH 3/4] fix the version of channelfinder --- test/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index dc9b22d..cafd9f4 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -19,7 +19,7 @@ version: "3.7" services: channelfinder: - image: ghcr.io/channelfinder/channelfinderservice:master + image: ghcr.io/channelfinder/channelfinderservice:ChannelFinder-4.7.3 hostname: channelfinder networks: - channelfinder-net From 2f5475377d8c1c18cadfb258284b2b7282329713 Mon Sep 17 00:00:00 2001 From: Sky Brewer Date: Fri, 20 Mar 2026 19:14:29 +0100 Subject: [PATCH 4/4] build from 3.6 up --- .github/workflows/ci.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7cd16ef..c5d1e8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,14 +15,26 @@ jobs: build: runs-on: ubuntu-latest + container: ${{ matrix.container }} strategy: - fail-fast: false matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + include: + - python-version: "3.6" + container: "python:3.6" + - python-version: "3.7" + container: "python:3.7" + - python-version: "3.8" + - python-version: "3.9" + - python-version: "3.10" + - python-version: "3.11" + - python-version: "3.12" + - python-version: "3.13" + - python-version: "3.14" steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} + if: ${{ !matrix.container }} uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -30,8 +42,8 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install . - test: + test: runs-on: ubuntu-latest strategy: fail-fast: false