Skip to content

Commit

Permalink
CI: fix event trigger branches, minor tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
kmilos committed Feb 13, 2024
1 parent 16584be commit d2b4953
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ concurrency:

on:
push:
branches: [0.27-maintenance, main]
branches: [0.28.x, main]
paths-ignore:
- "*.md"
pull_request:
# The branches below must be a subset of the branches above
branches: [0.27-maintenance, main]
branches: [0.28.x, main]
paths-ignore:
- "*.md"
workflow_dispatch:
Expand All @@ -40,8 +40,7 @@ jobs:

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libexpat1-dev zlib1g-dev libbrotli-dev libinih-dev
sudo eatmydata apt-get -y install libexpat1-dev zlib1g-dev libbrotli-dev libinih-dev
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on_PR_linux_special_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:

- name: Install dependencies
run: |
sudo apt-get install -y libxml2-dev libxslt-dev python3-dev ninja-build
python3 -m pip install conan==1.* gcovr
sudo eatmydata apt-get -y install libxml2-dev libxslt-dev python3-dev ninja-build gcovr
python3 -m pip install conan==1.*
- name: Conan common config
run: |
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/on_PR_windows_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ on:
- "*.md"
workflow_dispatch:
push:
branches:
- main
branches: [0.28.x, main]
tags:
- '!*'
paths-ignore:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on_push_ExtraJobsForMain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:

- name: Install dependencies
run: |
sudo apt-get install ninja-build
python3 -m pip install conan==1.* gcovr
sudo eatmydata apt-get -y install ninja-build gcovr
python3 -m pip install conan==1.*
- name: Conan common config
run: |
Expand Down

0 comments on commit d2b4953

Please sign in to comment.