build: use common workflows

itzg · Sep 24, 2023 · 0e96fc8 · 0e96fc8
1 parent d36d095
commit 0e96fc8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 51 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,7 +5,20 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    groups:
+      updates:
+        patterns:
+          - "*"
+        update-types:
+          - patch
+          - minor
   - package-ecosystem: gradle
     directory: /
     schedule:
       interval: weekly
+    groups:
+      patches:
+        patterns:
+          - "*"
+        update-types:
+          - patch
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,36 +10,9 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Setup Java JDK
-        uses: actions/setup-java@v3
-        with:
-          java-version: '18'
-          distribution: 'temurin'
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to image registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Gradle build and push
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: |
-            --scan
-            -PimageRepo=ghcr.io/itzg 
-            -PimagePush=true 
-            -PimageCacheFrom=type=gha
-            -PimageCacheTo=type=gha,mode=max
-            buildSimpleBootImage
+    uses: itzg/github-workflows/.github/workflows/simple-boot-image-to-ghcr.yml@main
+    with:
+      image-repo: "ghcr.io/itzg"
+      image-platforms: "linux/amd64"
+      java-version: "18"
+      extra-gradle-tasks: test
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -7,21 +7,8 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Setup Java JDK
-        uses: actions/setup-java@v3
-        with:
-          java-version: '18'
-          distribution: 'temurin'
-
-      - name: Gradle build
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: |
-            build
+    uses: itzg/github-workflows/.github/workflows/gradle-build.yml@main
+    with:
+      arguments: test
+      include-test-report: true
+      java-version: "18"