From bfafafcd268ec3c3fcd542b7909ead63bd5ba6bb Mon Sep 17 00:00:00 2001
From: Liam <lgh@e.email>
Date: Fri, 29 Dec 2023 16:18:32 +0100
Subject: move artififacts into folder

---
 .forgejo/workflows/demo.yaml |  3 +--
 sdk-12.0.0_r19/build.sh      |  6 +++++-
 sdk-12.1.0_r27/build.sh      |  6 +++++-
 sdk-13.0.0_r10/build.sh      | 10 +++++++---
 sdk-13.0.0_r18/build.sh      | 10 +++++++---
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/.forgejo/workflows/demo.yaml b/.forgejo/workflows/demo.yaml
index 3f113d7..8ce5069 100644
--- a/.forgejo/workflows/demo.yaml
+++ b/.forgejo/workflows/demo.yaml
@@ -3,9 +3,8 @@ jobs:
   test:
     runs-on: debian-latest
     steps:
-      - run:    sudo apt update 
       - run:  |
-         sudo apt install git repo gnupg flex bison gperf build-essential zip curl \
+         sudo apt update && apt install git repo gnupg flex bison gperf build-essential zip curl \
          zlib1g-dev gcc-multilib g++-multilib libc6-dev-i386 libncurses5-dev \
          libncurses5 libx11-dev lib32z1-dev libgl1-mesa-dev \
          libxml2-utils xsltproc unzip rsync python3 python-is-python3 tofrodos repo
diff --git a/sdk-12.0.0_r19/build.sh b/sdk-12.0.0_r19/build.sh
index 84731c7..5a370e7 100755
--- a/sdk-12.0.0_r19/build.sh
+++ b/sdk-12.0.0_r19/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Caution: VERSION needs to be identical in all scripts in this directory, 
+# Caution: VERSION needs to be identical in all scripts in this directory,
 # otherwise the build will not work.
 VERSION='12.0.0_r19'
 BUILD_VARIANT='eng'
@@ -27,3 +27,7 @@ ls -lah out/dist/sdk-repo*.zip
 ls -lah out/dist/sdk-symbols-${BUILD_NUMBER}.zip
 ls -lah out/dist/repo*.xml
 
+mkdir ../artifacts/${VERSION}
+mv out/dist ../artifacts/${VERSION}/
+
+echo "Moved SDK to artifact folder"
diff --git a/sdk-12.1.0_r27/build.sh b/sdk-12.1.0_r27/build.sh
index 649963a..b3a1960 100644
--- a/sdk-12.1.0_r27/build.sh
+++ b/sdk-12.1.0_r27/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Caution: VERSION needs to be identical in all scripts in this directory, 
+# Caution: VERSION needs to be identical in all scripts in this directory,
 # otherwise the build will not work.
 
 VERSION='12.1.0_r27'
@@ -28,3 +28,7 @@ ls -lah out/dist/sdk-repo*.zip
 ls -lah out/dist/sdk-symbols-${BUILD_NUMBER}.zip
 ls -lah out/dist/repo*.xml
 
+mkdir ../artifacts/${VERSION}
+mv out/dist ../artifacts/${VERSION}/
+
+echo "Moved SDK to artifact folder"
diff --git a/sdk-13.0.0_r10/build.sh b/sdk-13.0.0_r10/build.sh
index 7537aa9..d2779cf 100644
--- a/sdk-13.0.0_r10/build.sh
+++ b/sdk-13.0.0_r10/build.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-# Caution: VERSION needs to be identical in all scripts in this directory, 
+# Caution: VERSION needs to be identical in all scripts in this directory,
 # otherwise the build will not work.
 VERSION='13.0.0_r10'
 BUILD_VARIANT='eng'
 export USER=$(whoami)
 export BUILD_NUMBER="${BUILD_VARIANT}.${VERSION}"
-# needed, because otherwise conscrypt build will fail. ART and some other 
-# dependencies need to be built from source. 
+# needed, because otherwise conscrypt build will fail. ART and some other
+# dependencies need to be built from source.
 export ART_MODULE_BUILD_FROM_SOURCE=true
 export MODULE_BUILD_FROM_SOURCE=true
 
@@ -32,3 +32,7 @@ ls -lah out/dist/sdk-repo*.zip
 ls -lah out/dist/sdk-symbols-${BUILD_NUMBER}.zip
 ls -lah out/dist/repo*.xml
 
+mkdir ../artifacts/${VERSION}
+mv out/dist ../artifacts/${VERSION}/
+
+echo "Moved SDK to artifact folder"
diff --git a/sdk-13.0.0_r18/build.sh b/sdk-13.0.0_r18/build.sh
index 78e384e..78cdc1a 100644
--- a/sdk-13.0.0_r18/build.sh
+++ b/sdk-13.0.0_r18/build.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-# Caution: VERSION needs to be identical in all scripts in this directory, 
+# Caution: VERSION needs to be identical in all scripts in this directory,
 # otherwise the build will not work.
 
 VERSION='13.0.0_r18'
 BUILD_VARIANT='eng'
 export USER=$(whoami)
 export BUILD_NUMBER="${BUILD_VARIANT}.${VERSION}"
-# needed, because otherwise conscrypt build will fail. ART and some other 
-# dependencies need to be built from source. 
+# needed, because otherwise conscrypt build will fail. ART and some other
+# dependencies need to be built from source.
 export ART_MODULE_BUILD_FROM_SOURCE=true
 export MODULE_BUILD_FROM_SOURCE=true
 
@@ -33,3 +33,7 @@ ls -lah out/dist/sdk-repo*.zip
 ls -lah out/dist/sdk-symbols-${BUILD_NUMBER}.zip
 ls -lah out/dist/repo*.xml
 
+mkdir ../artifacts/${VERSION}
+mv out/dist ../artifacts/${VERSION}/
+
+echo "Moved SDK to artifact folder"
-- 
cgit v1.2.3