From 1e1bcf1996cb38c60ecc1651afb644f3da97054d Mon Sep 17 00:00:00 2001
From: Mark Nellemann <mark.nellemann@gmail.com>
Date: Mon, 14 Aug 2023 18:25:58 +0200
Subject: [PATCH] Test drone builds.

---
 .drone.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index a8e6f52..2650de1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,11 +10,10 @@ type: docker
 
 steps:
 
-  - name: test
-    image: docker.io/bellsoft/liberica-openjdk-debian:17
-    commands:
-      - ./gradlew --quiet --no-daemon test
-
+#  - name: test
+#    image: docker.io/bellsoft/liberica-openjdk-debian:17
+#    commands:
+#      - ./gradlew --quiet --no-daemon test
 
   - name: build-deb
     image: docker.io/debian:stable
@@ -22,26 +21,27 @@ steps:
       AUTH_TOKEN:                 # Gitea access token ENV variable
         from_secret: AUTH_TOKEN   # Name of DroneCI secret exposed above
     commands:
-      - apt-get update && apt-get install -y dpkg-dev unzip zip curl
-      - bash -c "curl -s 'https://get.sdkman.io' | bash"
-      - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install java 17.0.8.fx-librca"
-      - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && ./gradlew --no-daemon clean build jpackage"
+      - apt-get update && apt-get install -y dpkg-dev unzip zip curl openjdk-17-jdk
+ #     - bash -c "curl -s 'https://get.sdkman.io' | bash"
+ #     - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install java 17.0.8.fx-librca"
+ #     - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && ./gradlew --no-daemon clean build jpackage"
+      - ./gradlew --no-daemon clean build jpackage
       - for file in build/jpackage/*.deb ; do curl -s --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
     when:
       event:
         - tag
 
-
   - name: build-rpm
     image: docker.io/almalinux:8
     environment:
       AUTH_TOKEN:                 # Gitea access token ENV variable
         from_secret: AUTH_TOKEN   # Name of DroneCI secret exposed above
     commands:
-      - dnf -y install unzip zip curl rpm-build
-      - bash -c "curl -s 'https://get.sdkman.io' | bash"
-      - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install java 17.0.8.fx-librca"
-      - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && ./gradlew --no-daemon clean build jpackage"
+      - dnf -y install unzip zip curl rpm-build java-17-openjdk
+#      - bash -c "curl -s 'https://get.sdkman.io' | bash"
+#      - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install java 17.0.8.fx-librca"
+#      - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && ./gradlew --no-daemon clean build jpackage"
+      - ./gradlew --no-daemon clean build jpackage
       - for file in build/jpackage/*.rpm ; do curl -s --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
     when:
       event: