Skip to content

Commit 0cdf676

Browse files
authored
Merge pull request #2295 from Mab879/cancel_in_progress_workflows
Update GitHub Actions
2 parents 845d70f + 0eae286 commit 0cdf676

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
pull_request:
1111
branches: [ main, maint-1.3 ]
1212

13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.event.number || github.run_id }}
15+
cancel-in-progress: true
1316

1417
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1518
jobs:
@@ -22,7 +25,7 @@ jobs:
2225
# Steps represent a sequence of tasks that will be executed as part of the job
2326
steps:
2427
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
25-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v6
2629
with:
2730
submodules: recursive
2831

@@ -55,7 +58,7 @@ jobs:
5558
- name: Install Deps
5659
run: dnf install -y cmake git procps-ng dbus-devel libacl-devel libblkid-devel libcap-devel libcurl-devel libgcrypt-devel libselinux-devel libxml2-devel libxslt-devel libattr-devel make openldap-devel pcre2-devel perl-XML-Parser perl-XML-XPath perl-devel python3-devel python3-dbusmock rpm-devel swig bzip2-devel gcc-c++ libyaml-devel xmlsec1-devel xmlsec1-openssl-devel hostname bzip2 lua rpm-build which strace python3-pytest
5760
- name: Checkout
58-
uses: actions/checkout@v3
61+
uses: actions/checkout@v6
5962
with:
6063
submodules: recursive
6164
- name: Build
@@ -78,7 +81,7 @@ jobs:
7881
- name: Install Deps
7982
run: dnf install -y cmake git procps-ng dbus-devel libacl-devel libblkid-devel libcap-devel libcurl-devel nss-devel libselinux-devel libxml2-devel libxslt-devel libattr-devel make openldap-devel pcre2-devel perl-XML-Parser perl-XML-XPath perl-devel python3-devel python3-dbusmock rpm-devel swig bzip2-devel gcc-c++ libyaml-devel xmlsec1-devel xmlsec1-openssl-devel hostname bzip2 lua rpm-build which strace python3-pytest
8083
- name: Checkout
81-
uses: actions/checkout@v3
84+
uses: actions/checkout@v6
8285
with:
8386
submodules: recursive
8487
- name: Build
@@ -100,7 +103,7 @@ jobs:
100103
# Steps represent a sequence of tasks that will be executed as part of the job
101104
steps:
102105
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
103-
- uses: actions/checkout@v3
106+
- uses: actions/checkout@v6
104107

105108
# Runs a single command using the runners shell
106109
- name: Install Deps

.github/workflows/codeql.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@ on:
55
branches: [ 'maint-1.3', 'maint-1.2', 'main' ]
66
pull_request:
77
# The branches below must be a subset of the branches above
8-
branches: [ 'maint-1.3' ]
8+
branches: [ 'maint-1.3', 'main' ]
99
schedule:
1010
- cron: '32 17 * * 0'
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.event.number || github.run_id }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
analyze:
1418
name: Analyze
@@ -27,7 +31,7 @@ jobs:
2731

2832
steps:
2933
- name: Checkout repository
30-
uses: actions/checkout@v3
34+
uses: actions/checkout@v6
3135

3236
- name: Install Deps
3337
run: |

0 commit comments

Comments
 (0)