Skip to content

Commit

Permalink
Merge pull request #1048 from opengisch/QF-4434-update-ci
Browse files Browse the repository at this point in the history
Bump all CI deps
  • Loading branch information
suricactus authored Oct 15, 2024
2 parents 91aa976 + 3a47ab9 commit 0c4893f
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 31 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:

jobs:
backport:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
name: Backport
steps:
- name: Backport
uses: m-kuhn/[email protected].5
uses: m-kuhn/[email protected].7
with:
github_token: ${{ secrets.NYUKI_TOKEN }}
28 changes: 10 additions & 18 deletions .github/workflows/build_and_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:
- "v*.*.*"
jobs:
build_and_push:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Prepare
id: prepare
Expand All @@ -26,35 +26,27 @@ jobs:
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1

- name: Cache Docker layers
uses: actions/cache@v2
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
uses: docker/setup-buildx-action@v3

- name: Login to dockerhub
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

# Application
- name: Docker Test Application
id: docker_test_application
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
builder: ${{ steps.buildx.outputs.name }}
context: ./docker-app
file: ./docker-app/Dockerfile

- name: Docker Build and Push Application
id: docker_build_and_push_application
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
builder: ${{ steps.buildx.outputs.name }}
target: webserver_runtime
Expand All @@ -67,7 +59,7 @@ jobs:
- name: Docker Build and Push Worker
id: docker_build_and_push_worker
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
builder: ${{ steps.buildx.outputs.name }}
target: worker_wrapper_runtime
Expand All @@ -81,15 +73,15 @@ jobs:
# QGIS
- name: Docker Test QGIS
id: docker_test_qgis
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
builder: ${{ steps.buildx.outputs.name }}
context: ./docker-qgis
file: ./docker-qgis/Dockerfile

- name: Docker Build and Push QGIS
id: docker_build_and_push_qgis
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
builder: ${{ steps.buildx.outputs.name }}
context: ./docker-qgis
Expand All @@ -102,7 +94,7 @@ jobs:
# Nginx
- name: Docker Build and Push nginx
id: docker_build_and_push_nginx
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
builder: ${{ steps.buildx.outputs.name }}
context: ./docker-nginx
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: 'ubuntu-latest'
runs-on: ubuntu-24.04
permissions:
actions: read
contents: read
Expand All @@ -25,7 +25,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ on:

jobs:
stale:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/stale@v4
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.NYUKI_TOKEN }}
stale-issue-message: |
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@ jobs:
lint:
if: '! github.event.pull_request.draft'
name: Lint code base
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.12'
- name: Pre-commit
uses: pre-commit/[email protected].0
uses: pre-commit/[email protected].1

test:
name: Run tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand All @@ -44,7 +44,7 @@ jobs:
continue-on-error: true
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

Expand Down

0 comments on commit 0c4893f

Please sign in to comment.