Skip to content

Commit c416279

Browse files
committed
ci: coalesce styles
Signed-off-by: tison <[email protected]>
1 parent 39ed74a commit c416279

File tree

7 files changed

+88
-172
lines changed

7 files changed

+88
-172
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "CodeQL Analysis"
1+
name: CodeQL Analysis
22

33
on:
44
push:
@@ -22,24 +22,15 @@ jobs:
2222
security-events: write # for github/codeql-action/autobuild to send a status report
2323
name: Analyze
2424
runs-on: ubuntu-latest
25-
timeout-minutes: 12
26-
27-
strategy:
28-
fail-fast: false
29-
matrix:
30-
language: [ 'python' ]
25+
timeout-minutes: 15
3126

3227
steps:
33-
- name: Checkout repository
34-
uses: actions/checkout@master
35-
28+
- uses: actions/checkout@v6
3629
- name: Initialize CodeQL
3730
uses: github/codeql-action/init@v3
3831
with:
39-
languages: ${{ matrix.language }}
40-
32+
languages: python
4133
- name: Autobuild
4234
uses: github/codeql-action/autobuild@v3
43-
4435
- name: Perform CodeQL Analysis
4536
uses: github/codeql-action/analyze@v3

.github/workflows/depsreview.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
name: 'Dependency Review'
1+
name: Dependency Review
22

33
on:
44
pull_request:
5-
branches:
6-
- trunk
5+
branches: [ trunk ]
76

87
permissions:
98
contents: read # for actions/checkout to fetch code
@@ -16,12 +15,11 @@ jobs:
1615
dependency-review:
1716
name: Dependency Review
1817
runs-on: ubuntu-latest
18+
timeout-minutes: 15
1919

2020
steps:
21-
- name: 'Checkout Repository'
22-
uses: actions/checkout@v4
23-
24-
- name: 'Dependency Review'
21+
- uses: actions/checkout@v6
22+
- name: Dependency Review
2523
uses: actions/dependency-review-action@v4
2624
# TODO: We really want one check for direct prod dependencies where we
2725
# only allows ASF, MIT, BSD and nother one for testing / dev
Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,27 @@ permissions:
1313
jobs:
1414
install_and_verify:
1515
name: Install
16-
runs-on: ${{ matrix.os }}
17-
timeout-minutes: 2
16+
runs-on: ubuntu-latest
17+
timeout-minutes: 5
1818

1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
os:
23-
- "ubuntu-latest"
2422
python_version:
25-
- 3.7
26-
- 3.8
27-
- 3.9
23+
- "3.6"
24+
- "3.7"
25+
- "3.8"
26+
- "3.9"
2827
- "3.10"
2928
- "3.11"
3029
- "pypy-3.7"
3130
- "pypy-3.8"
3231
- "pypy-3.9"
33-
include:
34-
# python 3.6 is not supported with ubuntu-latest anymore so we need to
35-
# use ubuntu 20.04
36-
- python_version: 3.6
37-
os: ubuntu-20.04
3832

3933
steps:
40-
- uses: actions/checkout@master
41-
with:
42-
fetch-depth: 1
43-
34+
- uses: actions/checkout@v6
4435
- name: Use Python ${{ matrix.python_version }}
45-
uses: actions/setup-python@v5
36+
uses: actions/setup-python@v6
4637
with:
4738
python-version: ${{ matrix.python_version }}
4839

@@ -58,13 +49,10 @@ jobs:
5849
verify_checksums:
5950
name: Verify Artifacts Checksum
6051
runs-on: ubuntu-latest
61-
timeout-minutes: 2
52+
timeout-minutes: 5
6253

6354
steps:
64-
- uses: actions/checkout@master
65-
with:
66-
fetch-depth: 1
67-
55+
- uses: actions/checkout@v6
6856
- name: Verify Checksums
6957
run: |
7058
LAST_STABLE_VERSION=$(curl -s --fail https://pypi.org/pypi/apache-libcloud/json | jq ".releases | to_entries | last | .key" -r)

.github/workflows/integration-tests.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ name: Integration Tests
44

55
on:
66
push:
7-
branches:
8-
- trunk
7+
branches: [ trunk ]
98
pull_request:
10-
branches:
11-
- trunk
9+
branches: [ trunk ]
1210
schedule:
1311
- cron: '0 1 * * *'
1412

@@ -32,15 +30,12 @@ jobs:
3230

3331
strategy:
3432
matrix:
35-
python_version: [3.9]
33+
python_version: [ 3.9 ]
3634

3735
steps:
38-
- uses: actions/checkout@master
39-
with:
40-
fetch-depth: 1
41-
36+
- uses: actions/checkout@v6
4237
- name: Use Python ${{ matrix.python_version }}
43-
uses: actions/setup-python@v5
38+
uses: actions/setup-python@v6
4439
with:
4540
python-version: ${{ matrix.python_version }}
4641

@@ -50,7 +45,7 @@ jobs:
5045
sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq gcc libvirt-dev
5146
5247
- name: Cache Python Dependencies
53-
uses: actions/cache@v4
48+
uses: actions/cache@v5
5449
with:
5550
path: ~/.cache/pip
5651
key: ${{ runner.os }}-pip-${{ hashFiles('requirements-tests.txt', 'integration/storage/requirements.txt') }}

0 commit comments

Comments
 (0)