Skip to content

Commit de7e883

Browse files
authored
DVPL-12509: Update CI target matrix (#644)
* Update CI matrix, set ubuntu version in release workflow to 22.04 if we really want to use Python 3.7 * Adjust matrix to proposed configuration * Extract fossa-scan to separate workflow * Reduce invoking fossa scans to push only * Fix botched rename * Shorten comment in release.yml
1 parent 3c90fc2 commit de7e883

File tree

3 files changed

+21
-28
lines changed

3 files changed

+21
-28
lines changed

.github/workflows/fossa.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
name: Fossa OSS Scan
2+
on: [push]
3+
jobs:
4+
fossa-scan:
5+
uses: splunk/oss-scanning-public/.github/workflows/oss-scan.yml@main
6+
secrets: inherit

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ on:
66
jobs:
77
publish:
88
name: Deploy Release to PyPI
9-
runs-on: ubuntu-latest
9+
# Last version with Python 3.7 binaries available
10+
runs-on: ubuntu-22.04
1011
steps:
1112
- name: Checkout source
1213
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493

.github/workflows/test.yml

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,35 @@
11
name: Python CI
2-
32
on: [push, workflow_dispatch]
43

54
jobs:
65
build:
76
runs-on: ${{ matrix.os }}
87
strategy:
8+
fail-fast: false
99
matrix:
10-
os:
11-
- ubuntu-latest
12-
python: [3.9, 3.13]
13-
splunk-version:
14-
- "8.1"
15-
- "8.2"
16-
- "latest"
10+
os: [ubuntu-latest]
11+
python-version: [3.9]
12+
splunk-version: [9.4, latest]
1713
include:
14+
# Oldest possible configuration
15+
# Last Ubuntu version with Python 3.7 binaries available
1816
- os: ubuntu-22.04
19-
python: 3.7
20-
splunk-version: "8.1"
21-
- os: ubuntu-22.04
22-
python: 3.7
23-
splunk-version: "8.2"
24-
- os: ubuntu-22.04
25-
python: 3.7
26-
splunk-version: "latest"
27-
28-
fail-fast: false
29-
17+
python-version: 3.7
18+
splunk-version: 9.1
19+
# Latest possible configuration
20+
- os: ubuntu-latest
21+
python-version: 3.13
22+
splunk-version: latest
3023
steps:
3124
- name: Checkout code
3225
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
33-
3426
- name: Run docker compose
3527
run: SPLUNK_VERSION=${{ matrix.splunk-version }} docker compose up -d
36-
3728
- name: Setup Python
3829
uses: actions/setup-python@9322b3ca74000aeb2c01eb777b646334015ddd72
3930
with:
40-
python-version: ${{ matrix.python }}
41-
31+
python-version: ${{ matrix.python-version }}
4232
- name: Install tox
4333
run: pip install tox
44-
4534
- name: Test Execution
4635
run: tox -e py
47-
fossa-scan:
48-
uses: splunk/oss-scanning-public/.github/workflows/oss-scan.yml@main
49-
secrets: inherit

0 commit comments

Comments
 (0)