From b627b6c49ddeb08fef38e0ee9ec2d30ecd341633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 2 Oct 2024 09:35:24 +0000 Subject: [PATCH] Upgrade to GeoMapFish 2.9 --- .github/workflows/main.yaml | 6 ++++-- .python-version | 2 +- CONST_create_template/.github/workflows/main.yaml | 2 +- CONST_create_template/.github/workflows/rebuild.yaml | 2 +- CONST_create_template/.github/workflows/update_l10n.yaml | 2 +- CONST_create_template/ci/requirements.txt | 2 +- ci/requirements.txt | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 8ee65ae25..e426e142c 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -11,8 +11,8 @@ env: jobs: main: + runs-on: ubuntu-24.04 name: Continuous integration - runs-on: ubuntu-22.04 timeout-minutes: 20 steps: @@ -30,7 +30,9 @@ jobs: patterns: docker if: env.HAS_SECRETS == 'HAS_SECRETS' - - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH} + - uses: actions/setup-python@v5 + with: + python-version: '3.11' - run: python3 -m pip install --user --requirement=ci/requirements.txt - uses: actions/cache@v4 diff --git a/.python-version b/.python-version index 8cc1b46f5..c8cfe3959 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.10.15 +3.10 diff --git a/CONST_create_template/.github/workflows/main.yaml b/CONST_create_template/.github/workflows/main.yaml index ee8444ee5..415de6d6a 100644 --- a/CONST_create_template/.github/workflows/main.yaml +++ b/CONST_create_template/.github/workflows/main.yaml @@ -11,7 +11,7 @@ on: jobs: main: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 name: Continuous integration timeout-minutes: 10 diff --git a/CONST_create_template/.github/workflows/rebuild.yaml b/CONST_create_template/.github/workflows/rebuild.yaml index cd71fd158..963d0adb4 100644 --- a/CONST_create_template/.github/workflows/rebuild.yaml +++ b/CONST_create_template/.github/workflows/rebuild.yaml @@ -14,7 +14,7 @@ env: jobs: rebuild: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 name: Rebuild timeout-minutes: 10 diff --git a/CONST_create_template/.github/workflows/update_l10n.yaml b/CONST_create_template/.github/workflows/update_l10n.yaml index 966a3e022..1e0e99cac 100644 --- a/CONST_create_template/.github/workflows/update_l10n.yaml +++ b/CONST_create_template/.github/workflows/update_l10n.yaml @@ -7,7 +7,7 @@ on: jobs: l10n: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 name: Update l10n cron job timeout-minutes: 10 diff --git a/CONST_create_template/ci/requirements.txt b/CONST_create_template/ci/requirements.txt index c943f5a1c..4bdf52bc6 100644 --- a/CONST_create_template/ci/requirements.txt +++ b/CONST_create_template/ci/requirements.txt @@ -1,2 +1,2 @@ -c2cciutils[checks,publish]==1.6.22 +c2cciutils[checks,publish]==1.6.23 pre-commit==3.8.0 diff --git a/ci/requirements.txt b/ci/requirements.txt index c943f5a1c..4bdf52bc6 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,2 +1,2 @@ -c2cciutils[checks,publish]==1.6.22 +c2cciutils[checks,publish]==1.6.23 pre-commit==3.8.0