From 42c92915f81484adb6e19dbdd7f5f477c85a4dbe Mon Sep 17 00:00:00 2001
From: ansgarz <ansgar.zwick@meissa.de>
Date: Wed, 15 Nov 2023 18:06:42 +0100
Subject: [PATCH] move task package from build.gradle to build.py

---
 .gitlab-ci.yml |  8 +-------
 build.py       | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed4f169..9cd894d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,13 +69,7 @@ package:
   <<: *kotlin
   stage: package
   script:
-    - ./gradlew -x assemble -x test jar
-    - ./gradlew -x assemble -x test -x jar uberjarDesktop
-    - ./gradlew -x assemble -x test -x jar uberjarServer
-    - ./gradlew -x assemble -x test -x jar uberjarSyspec
-    - cd build/libs/
-    - find . -type f -exec sha256sum {} \; | sort > sha256sum.lst
-    - find . -type f -exec sha512sum {} \; | sort > sha512sum.lst
+    - pyb package
   artifacts:
     paths:
       - build/libs/*.jar
diff --git a/build.py b/build.py
index b06edd4..634e3d2 100644
--- a/build.py
+++ b/build.py
@@ -1,4 +1,3 @@
-from os import environ
 from subprocess import run
 from pybuilder.core import init, task
 from ddadevops import *
@@ -59,11 +58,23 @@ def tag(project):
     build = get_devops_build(project)
     build.tag_bump_and_push_release()
 
+
 @task
 def build(project):
     print("---------- build stage ----------")
     run("./gradlew assemble", shell=True)
 
+
+@task
+def package(project):
+    run("./gradlew -x test jar", shell=True)
+    run("./gradlew -x test uberjarDesktop", shell=True)
+    run("./gradlew -x test uberjarServer", shell=True)
+    run("./gradlew -x test uberjarSyspec", shell=True)
+    run("cd build/libs/ && find . -type f -exec sha256sum {} \; | sort > sha256sum.lst", shell=True)
+    run("cd build/libs/ && find . -type f -exec sha512sum {} \; | sort > sha512sum.lst", shell=True)
+
+
 def release(project):
     prepare(project)
     tag(project)