From 375380d518284468de94aaaff448f6820319abff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20J=C4=99drecki?= Date: Thu, 21 Aug 2025 15:36:09 +0200 Subject: [PATCH 1/6] Update CI matrix, set ubuntu version in release workflow to 22.04 if we really want to use Python 3.7 --- .github/workflows/release.yml | 3 ++- .github/workflows/test.yml | 26 +++++++------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe8c4831e..245f2554a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,8 @@ on: jobs: publish: name: Deploy Release to PyPI - runs-on: ubuntu-latest + # Ubuntu 22.04 is the last version with Python 3.7 binaries available + runs-on: ubuntu-22.04 steps: - name: Checkout source uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8a9056e2b..6b59a79e7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,32 +1,20 @@ name: Python CI - on: [push, workflow_dispatch] jobs: build: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: - os: - - ubuntu-latest - python: [3.9, 3.13] - splunk-version: - - "8.1" - - "8.2" - - "latest" + os: [ubuntu-latest] + python-version: [3.9, 3.13] + splunk-version: [9.4, latest] include: + # Ubuntu 22.04 is the last version with Python 3.7 binaries available - os: ubuntu-22.04 - python: 3.7 - splunk-version: "8.1" - - os: ubuntu-22.04 - python: 3.7 - splunk-version: "8.2" - - os: ubuntu-22.04 - python: 3.7 - splunk-version: "latest" - - fail-fast: false - + python-version: 3.7 + splunk-version: 9.1 steps: - name: Checkout code uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 From 65fe3efb7a20f32ebfbd2e3cd900d0fc10c339cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20J=C4=99drecki?= Date: Thu, 21 Aug 2025 16:04:13 +0200 Subject: [PATCH 2/6] Adjust matrix to proposed configuration --- .github/workflows/test.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6b59a79e7..ed9004657 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,13 +8,18 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - python-version: [3.9, 3.13] + python-version: [3.9] splunk-version: [9.4, latest] include: - # Ubuntu 22.04 is the last version with Python 3.7 binaries available + # Oldest possible configuration - os: ubuntu-22.04 + # Ubuntu 22.04 is the last version with Python 3.7 binaries available python-version: 3.7 splunk-version: 9.1 + # Latest possible configuration + - os: ubuntu-latest + python-version: 3.13 + splunk-version: latest steps: - name: Checkout code uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 From e992d5f57f86596a8681a61859aa64871e2ede53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20J=C4=99drecki?= Date: Thu, 21 Aug 2025 16:39:56 +0200 Subject: [PATCH 3/6] Extract fossa-scan to separate workflow --- .github/workflows/fossa.yml | 6 ++++++ .github/workflows/test.yml | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/fossa.yml diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml new file mode 100644 index 000000000..6c4b4fef7 --- /dev/null +++ b/.github/workflows/fossa.yml @@ -0,0 +1,6 @@ +name: Fossa OSS Scan +on: [push, pull_request] +jobs: + fossa-scan: + uses: splunk/oss-scanning-public/.github/workflows/oss-scan.yml@main + secrets: inherit diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ed9004657..6143323d1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: include: # Oldest possible configuration - os: ubuntu-22.04 - # Ubuntu 22.04 is the last version with Python 3.7 binaries available + # Ubuntu 22.04 is the last version with Python 3.7 binaries available python-version: 3.7 splunk-version: 9.1 # Latest possible configuration @@ -37,6 +37,3 @@ jobs: - name: Test Execution run: tox -e py - fossa-scan: - uses: splunk/oss-scanning-public/.github/workflows/oss-scan.yml@main - secrets: inherit From d6446a9cb475f1772ee2cb7a1a129294375404b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20J=C4=99drecki?= Date: Thu, 21 Aug 2025 17:32:15 +0200 Subject: [PATCH 4/6] Reduce invoking fossa scans to push only --- .github/workflows/fossa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index 6c4b4fef7..94ad93728 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -1,5 +1,5 @@ name: Fossa OSS Scan -on: [push, pull_request] +on: [push] jobs: fossa-scan: uses: splunk/oss-scanning-public/.github/workflows/oss-scan.yml@main From 023af0462374f009b25d04f5b49e33bcb1397721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20J=C4=99drecki?= Date: Thu, 21 Aug 2025 17:45:05 +0200 Subject: [PATCH 5/6] Fix botched rename --- .github/workflows/test.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6143323d1..4a895c54b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,8 +12,8 @@ jobs: splunk-version: [9.4, latest] include: # Oldest possible configuration + # Last Ubuntu version with Python 3.7 binaries available - os: ubuntu-22.04 - # Ubuntu 22.04 is the last version with Python 3.7 binaries available python-version: 3.7 splunk-version: 9.1 # Latest possible configuration @@ -23,17 +23,13 @@ jobs: steps: - name: Checkout code uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 - - name: Run docker compose run: SPLUNK_VERSION=${{ matrix.splunk-version }} docker compose up -d - - name: Setup Python uses: actions/setup-python@9322b3ca74000aeb2c01eb777b646334015ddd72 with: - python-version: ${{ matrix.python }} - + python-version: ${{ matrix.python-version }} - name: Install tox run: pip install tox - - name: Test Execution run: tox -e py From 2401d4af5376cca2434f19afa2d1b5775ff168f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20J=C4=99drecki?= Date: Fri, 22 Aug 2025 12:58:34 +0200 Subject: [PATCH 6/6] Shorten comment in release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 245f2554a..7073688d6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: jobs: publish: name: Deploy Release to PyPI - # Ubuntu 22.04 is the last version with Python 3.7 binaries available + # Last version with Python 3.7 binaries available runs-on: ubuntu-22.04 steps: - name: Checkout source