Skip to content

Commit

Permalink
CI: Only run the CI on pull requests, and on the "main" branch
Browse files Browse the repository at this point in the history
Previously, the actions were duplicated, due to the fact when developing
we often create feature branches and open pull requests.

This new setup requires us to open pull requests to trigger the CI.
  • Loading branch information
almet committed Nov 20, 2024
1 parent 504a9e1 commit 630083b
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 9 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Build dev environments
on:
pull_request:
push:
branches:
- main
- "test/**"
schedule:
- cron: "0 0 * * *" # Run every day at 00:00 UTC.

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_push.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Check branch conformity
on:
push:
pull_request:

jobs:
prevent-fixup-commits:
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
name: Tests
on:
push:
pull_request:
branches: [main]
push:
branches:
- main
- "test/**"
schedule:
- cron: "2 0 * * *" # Run every day at 02:00 UTC.
workflow_dispatch:
Expand Down Expand Up @@ -91,7 +93,8 @@ jobs:
windows:
runs-on: windows-latest
needs: download-tessdata
needs:
- download-tessdata
env:
DUMMY_CONVERSION: 1
steps:
Expand Down Expand Up @@ -121,7 +124,8 @@ jobs:
macOS:
name: "macOS (${{ matrix.arch }})"
runs-on: ${{ matrix.runner }}
needs: download-tessdata
needs:
- download-tessdata
strategy:
matrix:
include:
Expand Down Expand Up @@ -149,9 +153,10 @@ jobs:
run: poetry run make test

build-deb:
needs:
- build-container-image
name: "build-deb (${{ matrix.distro }} ${{ matrix.version }})"
runs-on: ubuntu-latest
needs: build-container-image
strategy:
matrix:
include:
Expand Down Expand Up @@ -219,7 +224,8 @@ jobs:
install-deb:
name: "install-deb (${{ matrix.distro }} ${{ matrix.version }})"
runs-on: ubuntu-latest
needs: build-deb
needs:
- build-deb
strategy:
matrix:
include:
Expand Down Expand Up @@ -273,7 +279,8 @@ jobs:
build-install-rpm:
name: "build-install-rpm (${{ matrix.distro }} ${{matrix.version}})"
runs-on: ubuntu-latest
needs: build-container-image
needs:
- build-container-image
strategy:
matrix:
distro: ["fedora"]
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/scan.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Scan latest app and container
on:
push:
branches:
- main
pull_request:
branches: [ main ]
schedule:
- cron: '0 0 * * *' # Run every day at 00:00 UTC.
workflow_dispatch:
Expand Down

0 comments on commit 630083b

Please sign in to comment.