Update Github Actions Workflow files

dnl50 · Jul 15, 2023 · 77f82d1 · 77f82d1
1 parent fce82e5
commit 77f82d1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 26 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -5,21 +5,21 @@ on:
     branches:
       - master
       - develop
+      - feature/**
   pull_request:
     branches:
       - master
       - develop
+      - feature/**
 
 jobs:
   check:
-
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
@@ -28,8 +28,5 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 
-      - name: Run Gradle 'check' Task
-        run: ./gradlew check
-
       - name: Run Gradle 'build' Task
         run: ./gradlew build
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,7 +2,7 @@ name: Publish Docker image
 
 on:
   release:
-    types: [published]
+    types: [released, prereleased]
 
 jobs:
   push_to_registry:
@@ -12,7 +12,7 @@ jobs:
       - name: Check out
         uses: actions/checkout@v3
 
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
@@ -21,32 +21,17 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 
-      - name: Build JAR
-        run: ./gradlew -PprojectVersion="${GITHUB_REF##*/}" build
-
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Extract metadata for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: dnl50/tsa-server
-          tags: |
-            type=semver,pattern={{version}}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+      - name: Build and Push Image
+        run: ./gradlew -PprojectVersion="${GITHUB_REF##*/}" build -Dquarkus.native.compression.level=9 -Dquarkus.container-image.push=true
 
       - name: Update Docker Hub description
+        if: ${{ github.event.action == 'released' }}
         uses: peter-evans/dockerhub-description@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -50,6 +50,10 @@ dependencies {
     testAnnotationProcessor("org.projectlombok:lombok:${libs.versions.lombok.get()}")
 }
 
+if (hasProperty("projectVersion")) {
+    version = property("projectVersion")!!
+}
+
 java {
     sourceCompatibility = JavaVersion.VERSION_17
 }