Skip to content

Commit f7adf0c

Browse files
Remove temporary regen-lockfile CI job
The lockfile has been regenerated and committed. Remove the temporary job and restore check-lock to run independently with the same cache and build environment setup as other jobs.
1 parent efb39f2 commit f7adf0c

File tree

1 file changed

+6
-39
lines changed

1 file changed

+6
-39
lines changed

.github/workflows/push.yml

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -75,54 +75,21 @@ jobs:
7575
- name: Check Unit Tests
7676
run: mvn --errors test
7777

78-
# TODO: Remove this job after the lockfile is regenerated.
79-
regen-lockfile:
80-
if: github.event_name == 'pull_request'
81-
runs-on:
82-
group: databricks-protected-runner-group
83-
labels: linux-ubuntu-latest
84-
85-
permissions:
86-
id-token: write
87-
contents: write
88-
89-
steps:
90-
- name: Checkout
91-
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
92-
with:
93-
ref: ${{ github.head_ref }}
94-
95-
- name: Setup build environment
96-
uses: ./.github/actions/setup-build-environment
97-
with:
98-
java-version: 11
99-
100-
- name: Regenerate lockfile
101-
run: make lock
102-
103-
- name: Normalize JFrog URLs
104-
run: make fix-lockfile
105-
106-
- name: Commit if changed
107-
run: |
108-
git diff --quiet -- '**/lockfile.json' && exit 0
109-
git config user.name "github-actions[bot]"
110-
git config user.email "github-actions[bot]@users.noreply.github.com"
111-
git add '**/lockfile.json'
112-
git commit -m "Regenerate lockfile for commons-configuration2 2.13.0"
113-
git push
114-
11578
check-lock:
116-
needs: regen-lockfile
11779
runs-on:
11880
group: databricks-protected-runner-group
11981
labels: linux-ubuntu-latest
12082

12183
steps:
12284
- name: Checkout
12385
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
86+
87+
- name: Cache Maven packages
88+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
12489
with:
125-
ref: ${{ github.head_ref }}
90+
path: ~/.m2/repository
91+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
92+
restore-keys: ${{ runner.os }}-m2
12693

12794
- name: Setup build environment
12895
uses: ./.github/actions/setup-build-environment

0 commit comments

Comments
 (0)