Skip to content

Commit

Permalink
Merge branch 'dev' into bump-python-version
Browse files Browse the repository at this point in the history
  • Loading branch information
Situphen authored Sep 26, 2024
2 parents eb48892 + 0d9bc43 commit a862685
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# Lint all source files by executing pre-commit hooks.
lint:
name: Lint
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

# do not execute scheduled jobs on forks:
if: ${{ github.event_name != 'schedule' || github.repository_owner == 'zestedesavoir' }}
Expand All @@ -44,7 +44,7 @@ jobs:
# Build the documentation and upload it as an artifact.
build-doc:
name: Build Sphinx documentation
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

# do not execute scheduled jobs on forks:
if: ${{ github.event_name != 'schedule' || github.repository_owner == 'zestedesavoir' }}
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
# Build the website front-end and upload built assets as an artifact.
build-front:
name: Lint and build front-end
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

# do not execute scheduled jobs on forks:
if: ${{ github.event_name != 'schedule' || github.repository_owner == 'zestedesavoir' }}
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
test:
name: Install and test zds-site
needs: build-front
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

strategy:
matrix:
Expand Down Expand Up @@ -182,6 +182,11 @@ jobs:
name: assets
path: dist

- name: Set up Python ${{ env.PYTHON_VERSION }}
uses: actions/setup-python@v5
with:
python-version: "${{ env.PYTHON_VERSION }}"

- name: Upgrade pip
run: |
pip install --upgrade pip
Expand All @@ -206,11 +211,6 @@ jobs:
restore-keys: |
${{ runner.os }}-node-
- name: Set up Python ${{ env.PYTHON_VERSION }}
uses: actions/setup-python@v5
with:
python-version: "${{ env.PYTHON_VERSION }}"

- name: Set up NodeJS ${{ env.NODE_VERSION }}
uses: actions/setup-node@v4
with:
Expand Down Expand Up @@ -246,7 +246,7 @@ jobs:
coverage:
name: Push coverage to Coveralls
needs: test
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Set up Python ${{ env.PYTHON_VERSION }}
Expand All @@ -266,7 +266,7 @@ jobs:
push_doc:
name: Push documentation to GitHub Pages
needs: ["build-doc", "test"]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: "github.ref == 'refs/heads/dev'"

environment:
Expand Down

0 comments on commit a862685

Please sign in to comment.