Skip to content

Commit

Permalink
Merge pull request #1462 from camptocamp/backport/1456-to-prod-2-9-ad…
Browse files Browse the repository at this point in the history
…vance

[Backport prod-2-9-advance] Upgrade failed
  • Loading branch information
sbrunner authored Oct 2, 2024
2 parents 116e387 + b627b6c commit 3cd934d
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ env:

jobs:
main:
runs-on: ubuntu-24.04
name: Continuous integration
runs-on: ubuntu-22.04
timeout-minutes: 20

steps:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.10.15
3.10
2 changes: 1 addition & 1 deletion CONST_create_template/.github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
main:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
name: Continuous integration
timeout-minutes: 10

Expand Down
2 changes: 1 addition & 1 deletion CONST_create_template/.github/workflows/rebuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:

jobs:
rebuild:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
name: Rebuild
timeout-minutes: 10

Expand Down
2 changes: 1 addition & 1 deletion CONST_create_template/.github/workflows/update_l10n.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion CONST_create_template/ci/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
c2cciutils[checks,publish]==1.6.22
c2cciutils[checks,publish]==1.6.23
pre-commit==3.8.0
2 changes: 1 addition & 1 deletion ci/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
c2cciutils[checks,publish]==1.6.22
c2cciutils[checks,publish]==1.6.23
pre-commit==3.8.0

0 comments on commit 3cd934d

Please sign in to comment.