Use Utils from CI to build Conty in CI

#156

.github/workflows/conty-autorelease.yml

@@ -8,10 +8,26 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          lfs: 'false'
+
+      - name: Download artifact
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: utils.yml
+          workflow_conclusion: success
+          if_no_artifact_found: ignore
+          path: /opt
 
       - name: Build Conty
         run: |
+          if [ -f /opt/Utils/utils.tar.gz ]; then
+              cp /opt/Utils/* .
+          fi
+
           chmod +x create-arch-bootstrap.sh create-conty.sh
           sudo ./create-arch-bootstrap.sh && ./create-conty.sh
 

.github/workflows/conty.yml

@@ -10,10 +10,26 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          lfs: 'false'
+
+      - name: Download artifact
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: utils.yml
+          workflow_conclusion: success
+          if_no_artifact_found: ignore
+          path: /opt
 
       - name: Build Conty
         run: |
+          if [ -f /opt/Utils/utils.tar.gz ]; then
+              cp /opt/Utils/* .
+          fi
+
           chmod +x create-arch-bootstrap.sh create-conty.sh
           sudo ./create-arch-bootstrap.sh && ./create-conty.sh
 

create-conty.sh

@@ -60,16 +60,9 @@ else
 	compressor_command=(mksquashfs "${bootstrap}" "${image_path}" "${squashfs_compressor_arguments[@]}")
 fi
 
-if [ ! -f "${utils}" ] || [ "$(wc -c < "${utils}")" -lt 100000 ]; then
-	if [ -d .git ]; then
-		git lfs install
- 		git lfs fetch origin master
-  		git lfs checkout
-    	fi
-
 if [ ! -f "${utils}" ] || [ "$(wc -c < "${utils}")" -lt 100000 ]; then
  	if git config --get remote.origin.url; then
-   			utils_url="$(git config --get remote.origin.url)"/raw/master/${utils}
+		utils_url="$(git config --get remote.origin.url)"/raw/"$(git rev-parse --abbrev-ref HEAD)"/${utils}
 	else
 		utils_url="https://github.com/Kron4ek/Conty/raw/master/${utils}"
    	fi
@@ -77,7 +70,6 @@ if [ ! -f "${utils}" ] || [ "$(wc -c < "${utils}")" -lt 100000 ]; then
 	rm -f "${utils}"
 	curl -#LO "${utils_url}"
 fi
-fi
 
 if [ ! -f conty-start.sh ]; then
 	echo "conty-start.sh is required!"