Skip to content

Commit

Permalink
CI: check that our Github Actions are able to run on ubuntu-24
Browse files Browse the repository at this point in the history
  • Loading branch information
almet committed Dec 12, 2024
1 parent fbe0506 commit 9f3fd48
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ env:
jobs:
build-dev-environment:
name: "Build dev-env (${{ matrix.distro }}-${{ matrix.version }})"
runs-on: ubuntu-latest
runs-on: ubuntu-24
strategy:
matrix:
include:
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/check_push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Check branch conformity
on:
pull_request:
push:
branches:
- main
- "test/**"

jobs:
prevent-fixup-commits:
runs-on: ubuntu-24
env:
target: debian-bookworm
distro: debian
version: bookworm
steps:
- name: Checkout
uses: actions/checkout@v4
- name: prevent fixup commits
run: |
git fetch origin
git status
git log --pretty=format:%s origin/main..HEAD | grep -ie '^fixup\|^wip' && exit 1 || true
8 changes: 6 additions & 2 deletions .github/workflows/check_repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@ on:
schedule:
- cron: '0 0 * * *' # Run every day at 00:00 UTC.
workflow_dispatch:
push:
branches:
- main
- "test/**"

jobs:
install-from-apt-repo:
name: "Install Dangerzone on ${{ matrix.distro}} ${{ matrix.version }}"
runs-on: ubuntu-latest
runs-on: ubuntu-24
container: ${{ matrix.distro }}:${{ matrix.version }}
strategy:
matrix:
Expand Down Expand Up @@ -70,7 +74,7 @@ jobs:
install-from-yum-repo:
name: "Install Dangerzone on ${{ matrix.distro}} ${{ matrix.version }}"
runs-on: ubuntu-latest
runs-on: ubuntu-24
container: ${{ matrix.distro }}:${{ matrix.version }}
strategy:
matrix:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ concurrency:

jobs:
run-lint:
runs-on: ubuntu-latest
runs-on: ubuntu-24
container:
image: debian:bookworm
steps:
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:

download-tessdata:
name: Download and cache Tesseract data
runs-on: ubuntu-latest
runs-on: ubuntu-24
steps:
- uses: actions/checkout@v4
- name: Cache Tessdata
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
needs:
- build-container-image
name: "build-deb (${{ matrix.distro }} ${{ matrix.version }})"
runs-on: ubuntu-latest
runs-on: ubuntu-24
strategy:
matrix:
include:
Expand Down Expand Up @@ -250,8 +250,8 @@ jobs:

install-deb:
name: "install-deb (${{ matrix.distro }} ${{ matrix.version }})"
runs-on: ubuntu-latest
needs:
runs-on: ubuntu-24
needs:
- build-deb
strategy:
matrix:
Expand Down Expand Up @@ -305,7 +305,7 @@ jobs:
build-install-rpm:
name: "build-install-rpm (${{ matrix.distro }} ${{matrix.version}})"
runs-on: ubuntu-latest
runs-on: ubuntu-24
needs:
- build-container-image
strategy:
Expand Down Expand Up @@ -377,7 +377,7 @@ jobs:
run-tests:
name: "run tests (${{ matrix.distro }} ${{ matrix.version }})"
runs-on: ubuntu-latest
runs-on: ubuntu-24
needs:
- build-container-image
- download-tessdata
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/close-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@ name: Close inactive issues
on:
schedule:
- cron: "30 1 * * *"
push:
branches:
- main
- "test/**"

jobs:
close-issues:
runs-on: ubuntu-latest
runs-on: ubuntu-24
permissions:
issues: write
steps:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ on:
push:
branches:
- main
- "test/**"
pull_request:
schedule:
- cron: '0 0 * * *' # Run every day at 00:00 UTC.
workflow_dispatch:

jobs:
security-scan-container:
runs-on: ubuntu-latest
runs-on: ubuntu-24
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -51,7 +52,7 @@ jobs:
severity-cutoff: critical

security-scan-app:
runs-on: ubuntu-latest
runs-on: ubuntu-24
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/scan_released.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: Scan released app and container
on:
push:
branches:
- main
- "test/**"
schedule:
- cron: '0 0 * * *' # Run every day at 00:00 UTC.
workflow_dispatch:
Expand All @@ -9,7 +13,7 @@ jobs:
strategy:
matrix:
include:
- runs-on: ubuntu-latest
- runs-on: ubuntu-24
arch: i686
# Do not scan Silicon mac for now to avoid masking release scan results for other plaforms.
# - runs-on: macos-latest
Expand Down Expand Up @@ -55,7 +59,7 @@ jobs:
severity-cutoff: critical

security-scan-app:
runs-on: ubuntu-latest
runs-on: ubuntu-24
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down

0 comments on commit 9f3fd48

Please sign in to comment.