Update actions/checkout action to v6

Reviewed-on: #18

.gitea/workflows/build.yml

@@ -1,17 +1,18 @@
 name: Build
 on:
-  push:
+  pull_request:
     branches:
-      - '*'
+      - master
+
 jobs:
   build:
-    runs-on: standard-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'

.gitea/workflows/deploy.yml

@@ -1,27 +1,28 @@
 name: Deploy
 on:
   push:
-    tags:
+    branches:
-      - 'v*'
+      - master
+
 jobs:
   build:
-    runs-on: standard-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
           cache: 'gradle'
 
       - name: Build Jar
-        run: ./gradlew bootJar
+        run: ./gradlew bootJar --no-daemon
 
       - name: Build Container
-        run: docker build --tag gitea.seeseepuff.be/seeseemelk/pcinv:${{github.ref_name}} .
+        run: docker build --tag gitea.seeseepuff.be/seeseemelk/pcinv:latest .
 
       - name: Login
         with: # Set the secret as an input
@@ -29,4 +30,4 @@ jobs:
         run: docker login gitea.seeseepuff.be -u seeseemelk -p ${{ secrets.PACKAGE_RW }}
 
       - name: Push Container
-        run: docker push gitea.seeseepuff.be/seeseemelk/pcinv:${{github.ref_name}}
+        run: docker push gitea.seeseepuff.be/seeseemelk/pcinv:latest

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-alpine
+FROM eclipse-temurin:25-alpine@sha256:30d9f87d702c2c1c601ed0d31e0c88ea1ea474ee7676cda7b7a59e759181c4dd
 WORKDIR /app
 ADD ./build/libs/pcinv-0.0.1-SNAPSHOT.jar /app/pcinv.jar
 ENTRYPOINT ["java", "-jar", "pcinv.jar"]

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     java
-    id("org.springframework.boot") version "3.5.0"
+    id("org.springframework.boot") version "4.0.6"
     id("io.spring.dependency-management") version "1.1.7"
 }
 
@@ -28,8 +28,8 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
-    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8")
+    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.3")
-    implementation("org.modelmapper:modelmapper:3.2.3")
+    implementation("org.modelmapper:modelmapper:3.2.6")
     compileOnly("org.projectlombok:lombok")
     developmentOnly("org.springframework.boot:spring-boot-devtools")
     runtimeOnly("org.postgresql:postgresql")

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   database:
-    image: postgres:latest
+    image: postgres:latest@sha256:78481659c47e862334611ccdaf7c369c986b3046da9857112f3b309114a65fb4
     environment:
       POSTGRES_USER: pcinv
       POSTGRES_PASSWORD: pcinv

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>seeseemelk/renovate"
+  ]
+}

src/main/java/be/seeseepuff/pcinv/controllers/WebController.java

@@ -96,7 +96,10 @@ public class WebController {
         model.addAttribute(DESCRIPTORS, tree);
         model.addAttribute(PROPERTIES, tree.stream().flatMap(d -> d.getProperties().stream()).toList());
         var assets = assetService.getAssetsByType(type);
-        assets.sort(Comparator.comparing(Asset::getQr));
+        assets.sort(Comparator
+                .comparing((Asset a) -> a.getAsset().getBrand(), Comparator.nullsFirst(Comparator.naturalOrder()))
+                .thenComparing((Asset a) -> a.getAsset().getModel(), Comparator.nullsFirst(Comparator.naturalOrder()))
+                .thenComparing(Asset::getQr));
         model.addAttribute(ASSETS, assets);
         return "browse_type";
     }

src/main/resources/templates/browse_type.html

@@ -9,7 +9,8 @@
         <tr th:each="a : ${assets}">
             <td th:each="p : ${properties}" th:if="${!p.hideInOverview}">
                 <a th:if="${p.name == 'qr'}" th:href="'/view/'+${a.getQr()}" th:text="${p.renderValue(a)}"></a>
-                <span th:if="${p.name != 'qr'}" th:text="${p.renderValue(a)}"></span>
+                <a th:if="${p.name == 'build' && a.getAsset().getBuild() != null}" th:href="'/build/'+${a.getAsset().getBuild().getId()}" th:text="${p.renderValue(a)}"></a>
+                <span th:if="${p.name != 'qr' && (p.name != 'build' || a.getAsset().getBuild() == null)}" th:text="${p.renderValue(a)}"></span>
             </td>
             <td>
                 <a th:href="'/view/'+${a.getQr()}">View</a>