Skip to content

Commit 5f2deea

Browse files
Heiko KieselWeltraumschaf
authored andcommitted
Refactor github workflows
Signed-off-by: Heiko Kiesel <heiko.kiesel@iteratec.com>
1 parent 56e2a40 commit 5f2deea

File tree

3 files changed

+46
-31
lines changed

3 files changed

+46
-31
lines changed

.github/workflows/release.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,40 @@
55
# This workflow will publish a Java project with Gradle
66
# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-java-packages-with-gradle
77

8-
name: Publish Release to Maven Central
8+
name: Publish Release
99

10-
on:
11-
release:
12-
types: [published]
10+
on: workflow_dispatch
1311

1412
jobs:
15-
build:
13+
publish-release:
1614
runs-on: ubuntu-22.04
1715
steps:
18-
- uses: actions/checkout@v3
16+
17+
- name: Checkout repository
18+
uses: actions/checkout@v3
19+
20+
- name: Fetch git tags # Required for axion-release-plugin
21+
run: git fetch --tags --unshallow
22+
1923
- name: Set up JDK 17
2024
uses: actions/setup-java@v3
2125
with:
2226
java-version: 17
2327
distribution: adopt
28+
2429
- name: Validate Gradle wrapper
2530
uses: gradle/wrapper-validation-action@v1.1.0
31+
2632
- name: Setup Gradle
2733
uses: gradle/gradle-build-action@v2.7.0
28-
- name: Mark next version
29-
run: ./gradlew markNextVersion -Prelease.version=${{ github.event.release.tag_name }}
30-
- name: Release
34+
35+
- name: Release new version
3136
run: ./gradlew release
37+
3238
- name: Publish to Maven Central
3339
run: ./gradlew publish
3440
env:
3541
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
3642
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
3743
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
3844
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
39-
DD_CLIENT_VERSION: ${{ github.event.release.tag_name }}
Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,37 @@
66
# For gradle wrapper validation see: https://github.com/marketplace/actions/gradle-wrapper-validation
77
# For gradle build see: https://github.com/marketplace/actions/gradle-build-action
88

9-
name: Publish Snapshot to Maven Central
9+
name: Publish Snapshot
1010

1111
on:
1212
push:
13-
branches:
14-
- 'main'
13+
branches: ['main']
1514

1615
jobs:
17-
build:
16+
publish-snapshot:
1817
runs-on: ubuntu-22.04
1918
steps:
20-
- uses: actions/checkout@v3
19+
20+
- name: Checkout repository
21+
uses: actions/checkout@v3
22+
23+
- name: Fetch git tags # Required for axion-release-plugin
24+
run: git fetch --tags --unshallow
25+
2126
- name: Set up JDK 17
2227
uses: actions/setup-java@v3
2328
with:
2429
java-version: 17
2530
distribution: adopt
31+
2632
- name: Validate Gradle wrapper
2733
uses: gradle/wrapper-validation-action@v1.1.0
34+
2835
- name: Setup Gradle
2936
uses: gradle/gradle-build-action@v2.7.0
30-
- name: Release
31-
run: ./gradlew release
37+
3238
- name: Publish to Maven Central
3339
run: ./gradlew publish
3440
env:
3541
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
3642
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
37-
DD_CLIENT_VERSION: ${{ github.event.release.tag_name }}

.github/workflows/test.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,21 @@ name: Java Tests
99
on: [pull_request, push, workflow_dispatch]
1010

1111
jobs:
12-
build:
13-
runs-on: ubuntu-22.04
14-
steps:
15-
- uses: actions/checkout@v3
16-
- name: Set up JDK 17
17-
uses: actions/setup-java@v3
18-
with:
19-
java-version: 17
20-
distribution: adopt
21-
- name: Grant execute permission for gradlew
22-
run: chmod +x gradlew
23-
- name: Build with Gradle
24-
run: ./gradlew build
12+
test:
13+
runs-on: ubuntu-22.04
14+
steps:
15+
16+
- name: Checkout repository
17+
uses: actions/checkout@v3
18+
19+
- name: Set up JDK 17
20+
uses: actions/setup-java@v3
21+
with:
22+
java-version: 17
23+
distribution: adopt
24+
25+
- name: Setup Gradle
26+
uses: gradle/gradle-build-action@v2.7.0
27+
28+
- name: Build with Gradle
29+
run: ./gradlew build

0 commit comments

Comments
 (0)