Skip to content

Commit 16dbd3d

Browse files
author
Raphael Vullriede
committed
fix: align CI
1 parent 96abc83 commit 16dbd3d

File tree

5 files changed

+192
-86
lines changed

5 files changed

+192
-86
lines changed

.github/workflows/build-on-push.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,23 @@ name: build-on-push
22

33
on:
44
push:
5-
branches: [ main ]
6-
pull_request:
7-
branches: [ main ]
5+
branches-ignore:
6+
- main
87

98
jobs:
10-
build:
9+
build-on-push:
1110
runs-on: ubuntu-latest
11+
1212
steps:
13-
- uses: actions/checkout@v4
13+
- name: checkout
14+
uses: actions/checkout@v4
15+
1416
- name: setup-jdk
1517
uses: actions/setup-java@v4
1618
with:
1719
java-version: 17
1820
distribution: 'temurin'
1921
cache: maven
20-
- name: maven-build
21-
run: mvn --batch-mode --update-snapshots package
22+
23+
- name: maven-build-verify
24+
run: mvn --batch-mode --update-snapshots verify
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: build-release-on-main-push
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
build-release-on-main-push:
10+
if: ${{ !contains(github.event.head_commit.message, '[release]') }} # prevent recursive releases
11+
runs-on: ubuntu-latest
12+
13+
permissions:
14+
contents: write
15+
packages: write
16+
17+
steps:
18+
- name: checkout
19+
uses: actions/checkout@v4
20+
with:
21+
ref: main
22+
23+
- name: setup-jdk
24+
uses: actions/setup-java@v4
25+
with:
26+
java-version: 17
27+
distribution: 'temurin'
28+
cache: maven
29+
server-id: ossrh
30+
server-username: MAVEN_USERNAME
31+
server-password: MAVEN_PASSWORD
32+
gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
33+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
34+
35+
- name: maven-build-verify
36+
run: mvn --batch-mode verify
37+
38+
- name: configure-git-user
39+
uses: qoomon/actions--setup-git@v1
40+
with:
41+
user: bot
42+
43+
- name: publish-on-maven-central
44+
run: mvn --batch-mode -P osslabz-release clean release:clean release:prepare release:perform
45+
env:
46+
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
47+
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
48+
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
49+
50+
- name: 'get-latest-tag'
51+
id: 'get-latest-tag'
52+
uses: "WyriHaximus/github-action-get-previous-tag@v1"
53+
54+
- name: create-release-notes
55+
uses: softprops/action-gh-release@v2
56+
with:
57+
generate_release_notes: true
58+
tag_name: ${{ steps.get-latest-tag.outputs.tag }}
59+
60+
- name: merge-main-to-dev
61+
run: |
62+
git fetch --unshallow
63+
git checkout dev
64+
git pull
65+
git merge --no-ff main -m "[release] auto-merge released main back to dev"
66+
git push
Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
name: dependabot-pr-auto-merge
2+
23
on: pull_request
34

5+
permissions:
6+
contents: write
7+
pull-requests: write
8+
49
jobs:
5-
dependabot:
10+
dependabot-pr-auto-merge:
611
runs-on: ubuntu-latest
7-
permissions:
8-
contents: write
9-
pull-requests: write
10-
repository-projects: write
12+
1113
if: github.actor == 'dependabot[bot]'
1214
steps:
1315
- name: dependabot-pr-fetch-metadata
14-
id: metadata
1516
uses: dependabot/fetch-metadata@v2
16-
with:
17-
github-token: "${{ secrets.GITHUB_TOKEN }}"
17+
1818
- name: dependabot-pr-approve
1919
run: gh pr review --approve "$PR_URL"
2020
env:
2121
PR_URL: ${{github.event.pull_request.html_url}}
22-
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
22+
2323
- name: dependabot-pr-auto-merge
2424
run: gh pr merge --auto --merge "$PR_URL"
2525
env:
26-
PR_URL: ${{github.event.pull_request.html_url}}
27-
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
26+
PR_URL: ${{github.event.pull_request.html_url}}

.github/workflows/publish-on-release.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)