Skip to content

Commit b6d51bf

Browse files
chore: revert github configuration to match main
1 parent 410b417 commit b6d51bf

File tree

6 files changed

+47
-45
lines changed

6 files changed

+47
-45
lines changed

.github/renovate.json

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,26 +53,18 @@
5353
]
5454
},
5555
{
56-
"description": "Always open PRs immediately and prioritize Renovate GitHub Action updates",
57-
"matchManagers": ["github-actions"],
58-
"matchPackageNames": ["renovatebot/github-action"],
56+
"description": "Always open PRs immediately for Renovate GitHub Action updates",
57+
"matchManagers": [
58+
"github-actions"
59+
],
60+
"matchPackageNames": [
61+
"renovatebot/github-action"
62+
],
5963
"prCreation": "immediate",
60-
"prPriority": 100,
61-
"stabilityDays": 0,
6264
"minimumReleaseAge": "0 days",
63-
"schedule": ["at any time"]
64-
},
65-
{
66-
"description": "Automerge safe GitHub Actions patch updates",
67-
"matchManagers": ["github-actions"],
68-
"matchUpdateTypes": ["patch"],
69-
"automerge": true,
70-
"automergeType": "pr"
71-
},
72-
{
73-
"description": "Require dashboard approval for major updates",
74-
"matchUpdateTypes": ["major"],
75-
"dependencyDashboardApproval": true
65+
"schedule": [
66+
"at any time"
67+
]
7668
}
7769
]
7870
}

.github/workflows/build-and-test.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ on:
1717

1818

1919
jobs:
20-
build-and-test:
20+
build-and-testExpected:
2121
runs-on: ubuntu-latest
2222

2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@v5
25+
uses: actions/checkout@v6
2626
with:
2727
fetch-depth: 0
2828

@@ -47,4 +47,7 @@ jobs:
4747
cache: pip
4848

4949
- name: Run Python Unit Tests
50-
run: test/python_unit_tests/run_python_unit_tests.sh
50+
run: |
51+
test/python_unit_tests/run_python_unit_tests.sh
52+
53+

.github/workflows/release.yml

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ on:
66
workflow_dispatch:
77
inputs:
88
dry_run:
9-
description: "Do not push/tag or create a GitHub Release"
9+
description: "DRY RUN: Do not push/tag or create a GitHub Release"
1010
type: boolean
11-
default: true
11+
default: false
1212
base_ref:
1313
description: "Branch to release from (for testing)"
1414
type: string
@@ -30,7 +30,7 @@ jobs:
3030
artifact_id: ${{ steps.get_artifact_id.outputs.artifact_id }}
3131
steps:
3232
- name: Checkout base branch
33-
uses: actions/checkout@v5
33+
uses: actions/checkout@v6
3434
with:
3535
fetch-depth: 0
3636
ref: ${{ github.event.inputs.base_ref || 'main' }}
@@ -116,16 +116,11 @@ jobs:
116116
exit 0
117117
fi
118118
119-
mvn -q -B versions:set -DnewVersion="${TAG_NAME}" -DgenerateBackupPoms=false
120-
if ! git diff --quiet; then
121-
git config user.name "github-actions[bot]"
122-
git config user.email "github-actions[bot]@users.noreply.github.com"
123-
git add -A
124-
git commit -m "Release ${TAG_NAME}: set project version to ${TAG_NAME}"
125-
else
126-
echo "No changes to commit (version already ${TAG_NAME})."
127-
fi
119+
# We skip committing changes to the repo. Use versions:set only in the build step ephemerally.
120+
echo "Skipping persistent version bump in pom.xml to avoid branch protection issues."
128121
122+
git config --global user.email "github-actions[bot]@users.noreply.github.com"
123+
git config --global user.name "github-actions[bot]"
129124
git fetch --prune --tags origin
130125
if git rev-parse "${TAG_NAME}" >/dev/null 2>&1; then
131126
echo "Tag ${TAG_NAME} already exists. Exiting."
@@ -141,14 +136,14 @@ jobs:
141136
steps:
142137
- name: Checkout the tag (real release)
143138
if: ${{ github.event.inputs.dry_run != 'true' }}
144-
uses: actions/checkout@v5
139+
uses: actions/checkout@v6
145140
with:
146141
fetch-depth: 0
147142
ref: ${{ needs.prepare-release.outputs.tag_name }}
148143

149144
- name: Checkout the base branch (dry run)
150145
if: ${{ github.event.inputs.dry_run == 'true' }}
151-
uses: actions/checkout@v5
146+
uses: actions/checkout@v6
152147
with:
153148
fetch-depth: 0
154149
ref: ${{ github.event.inputs.base_ref || 'main' }}
@@ -160,15 +155,13 @@ jobs:
160155
java-version: 21
161156
cache: maven
162157

163-
- name: In dry run - set project version to computed tag (no commit)
164-
if: ${{ github.event.inputs.dry_run == 'true' }}
158+
- name: Set project version for build (ephemeral)
165159
env:
166160
TAG_NAME: ${{ needs.prepare-release.outputs.tag_name }}
167161
shell: bash
168162
run: |
169163
set -euo pipefail
170164
mvn -q -B versions:set -DnewVersion="${TAG_NAME}" -DgenerateBackupPoms=false
171-
# No commit; only adjust the working tree so the built artifact names match
172165
173166
- name: Build JARs
174167
shell: bash
@@ -190,7 +183,7 @@ jobs:
190183
191184
- name: In dry run - upload build outputs as workflow artifacts
192185
if: ${{ github.event.inputs.dry_run == 'true' }}
193-
uses: actions/upload-artifact@v5
186+
uses: actions/upload-artifact@v6
194187
with:
195188
name: dry-run-${{ needs.prepare-release.outputs.tag_name }}
196189
path: |

.github/workflows/renovate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
security-events: read # read Dependabot vulnerability alerts
2727
steps:
2828
# Checks out the repository under $GITHUB_WORKSPACE
29-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v6
3030

3131
# Runs the Renovate GitHub Action
3232
- name: Renovate
33-
uses: renovatebot/github-action@v43.0.18
33+
uses: renovatebot/github-action@v44.2.4
3434
with:
3535
token: ${{ secrets.GITHUB_TOKEN }} # required to create PRs/issues
3636
configurationFile: .github/renovate.json

.github/workflows/scan-cve.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,26 @@ on:
66
push:
77
branches:
88
- main
9+
workflow_dispatch:
10+
911

1012
# Cancel previous jobs
1113
concurrency:
1214
group: cve-scan-${{ github.ref }}
1315
cancel-in-progress: true
16+
17+
permissions:
18+
contents: read
19+
security-events: write
20+
1421

1522
jobs:
1623
depchecktest:
1724
runs-on: ubuntu-latest
1825
name: depecheck_test
1926
steps:
2027
- name: Checkout
21-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
2229
- name: Setup JDK 21
2330
uses: actions/setup-java@v5
2431
with:
@@ -32,6 +39,7 @@ jobs:
3239
id: Depcheck
3340
env:
3441
JAVA_HOME: /opt/jdk
42+
3543
with:
3644
project: ${{github.repository}}
3745
path: '.'
@@ -45,7 +53,7 @@ jobs:
4553
--out ./reports
4654
- name: Upload Test results
4755
if: ${{ always() }}
48-
uses: actions/upload-artifact@v4
56+
uses: actions/upload-artifact@v6
4957
with:
5058
name: Depcheck report
5159
path: ${{github.workspace}}/reports

.github/workflows/scan-license.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ name: License Scanning for Maven
55
on:
66
schedule:
77
- cron: '0 8,18 * * 1-5'
8+
workflow_dispatch:
9+
810
push:
911
paths:
1012
- './pom.xml'
@@ -49,11 +51,15 @@ env:
4951
"
5052
REPORT_PATH: "target/generated-resources/licenses.xml"
5153

54+
permissions:
55+
contents: read
56+
57+
5258
jobs:
5359
scan:
5460
runs-on: ubuntu-latest
5561
steps:
56-
- uses: actions/checkout@v5
62+
- uses: actions/checkout@v6
5763
- name: Set up JDK 21
5864
uses: actions/setup-java@v5
5965
with:
@@ -76,7 +82,7 @@ jobs:
7682
if [ $LINES_FOUND -gt 1 ]; then echo $LICENSE_REPORT ; exit -1; fi
7783
working-directory: .
7884
- name: Upload license XML reports
79-
uses: actions/upload-artifact@v4
85+
uses: actions/upload-artifact@v6
8086
with:
8187
name: license-xml-report
8288
path: './**/${{ env.REPORT_PATH }}'

0 commit comments

Comments
 (0)