fix artcraft

8 files changed, 93 insertions, 28 deletions

diff --git a/.forgejo/workflows/artcraft-update.yml b/.forgejo/workflows/artcraft-update.yml
index 4be1e35..21788ee 100644
--- a/.forgejo/workflows/artcraft-update.yml
+++ b/.forgejo/workflows/artcraft-update.yml
@@ -124,6 +124,15 @@ jobs:
           CORE="/tmp/raveos-core-repo/x86_64"
           APPS=(designcraft effectcraft filmcraft lightcraft pdfcraft photocraft vectorcraft)
           FAILED=()
+          CACHE="$HOME/.cache/artcraft"
+          [ -d "$HOME/runner" ] && CACHE="$HOME/runner/cache/artcraft"
+          if [ -d "$CACHE/target" ] && [ "$(du -s "$CACHE/target" | cut -f1)" -gt 31457280 ]; then
+            echo "A build cache 30 GB folott van, uritem: $CACHE/target"
+            rm -rf "$CACHE/target"
+          fi
+          mkdir -p "$CACHE/cargo" "$CACHE/target"
+          export ARTCRAFT_CARGO_HOME="$CACHE/cargo" ARTCRAFT_TARGET_DIR="$CACHE/target"
+          echo "Build cache: $CACHE, szalak: $(nproc), szabad memoria: $(awk '/MemAvailable/ {print int($2 / 1048576)}' /proc/meminfo) GB"
           for app in "${APPS[@]}"; do
             cd "artcraft-raveos/${app}" || { FAILED+=("$app"); continue; }
             PKGVER=$(grep '^pkgver=' PKGBUILD | cut -d= -f2)
diff --git a/artcraft-raveos/designcraft/PKGBUILD b/artcraft-raveos/designcraft/PKGBUILD
index 8e3da45..02c180c 100644
--- a/artcraft-raveos/designcraft/PKGBUILD
+++ b/artcraft-raveos/designcraft/PKGBUILD
@@ -19,13 +19,21 @@ sha256sums=('d1baa1292ff2543ae7ce66fe80c63d45908e95e98b46f2915522d4a9d312b873')
 
 _srcenv() {
 	cd "$_archive"
-	export CARGO_HOME="$srcdir"
+	export CARGO_HOME="${ARTCRAFT_CARGO_HOME:-$srcdir}"
 	export CARGO_PROFILE_RELEASE_OPT_LEVEL=3
-	export CARGO_TARGET_DIR=target
+	export CARGO_TARGET_DIR="${ARTCRAFT_TARGET_DIR:-target}"
 	export RUSTUP_TOOLCHAIN=stable
 	CFLAGS+=' -fno-lto'
 }
 
+_jobs() {
+	local mem cpu
+	mem=$(awk '/MemAvailable/ {print int($2 / 2097152)}' /proc/meminfo)
+	cpu=$(nproc)
+	(( mem < 1 )) && mem=1
+	echo $(( mem < cpu ? mem : cpu ))
+}
+
 _icons=(512 256 128 64 48 32 16)
 
 prepare() {
@@ -35,13 +43,13 @@ prepare() {
 
 build() {
 	_srcenv
-	cargo build --frozen --release -j2
+	cargo build --frozen --release -j"$(_jobs)"
 }
 
 package() {
 	depends+=(libgcc_s.so)
 	cd "$_archive"
-	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"{,-cli}
+	install -Dm0755 -t "$pkgdir/usr/bin/" "${ARTCRAFT_TARGET_DIR:-target}/release/$pkgname"{,-cli}
 	install -Dm0644 -t "$pkgdir/usr/share/applications/" "packaging/linux/ai.storyteller.$pkgname.desktop"
 	install -Dm0644 -t "$pkgdir/usr/share/mime/packages/" "packaging/linux/ai.storyteller.$pkgname.mime.xml"
 	install -Dm0644 -t "$pkgdir/usr/share/icons/hicolor/scalable/" assets/app-icon/hicolor/scalable/apps/ai.storyteller.$pkgname.svg
diff --git a/artcraft-raveos/effectcraft/PKGBUILD b/artcraft-raveos/effectcraft/PKGBUILD
index 88bd19b..cbc72c6 100644
--- a/artcraft-raveos/effectcraft/PKGBUILD
+++ b/artcraft-raveos/effectcraft/PKGBUILD
@@ -20,13 +20,21 @@ sha256sums=('a5786740061f7aeb6cd2511398b91646cb239a85197dc8c1852f79c833acd1bf')
 
 _srcenv() {
 	cd "$_archive"
-	export CARGO_HOME="$srcdir"
+	export CARGO_HOME="${ARTCRAFT_CARGO_HOME:-$srcdir}"
 	export CARGO_PROFILE_RELEASE_OPT_LEVEL=3
-	export CARGO_TARGET_DIR=target
+	export CARGO_TARGET_DIR="${ARTCRAFT_TARGET_DIR:-target}"
 	export RUSTUP_TOOLCHAIN=stable
 	CFLAGS+=' -fno-lto'
 }
 
+_jobs() {
+	local mem cpu
+	mem=$(awk '/MemAvailable/ {print int($2 / 2097152)}' /proc/meminfo)
+	cpu=$(nproc)
+	(( mem < 1 )) && mem=1
+	echo $(( mem < cpu ? mem : cpu ))
+}
+
 _icons=(512 256 128 64 48 32 16)
 
 prepare() {
@@ -36,14 +44,14 @@ prepare() {
 
 build() {
 	_srcenv
-	cargo build --frozen --release -j2
+	cargo build --frozen --release -j"$(_jobs)"
 }
 
 package() {
 	depends+=(libasound.so
 	          libgcc_s.so)
 	cd "$_archive"
-	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"{,-cli}
+	install -Dm0755 -t "$pkgdir/usr/bin/" "${ARTCRAFT_TARGET_DIR:-target}/release/$pkgname"{,-cli}
 	install -Dm0644 -t "$pkgdir/usr/share/applications/" "packaging/linux/ai.storyteller.$pkgname.desktop"
 	install -Dm0644 -t "$pkgdir/usr/share/mime/packages/" "packaging/linux/ai.storyteller.$pkgname.mime.xml"
 	install -Dm0644 -t "$pkgdir/usr/share/icons/hicolor/scalable/" assets/app-icon/hicolor/scalable/apps/ai.storyteller.$pkgname.svg
diff --git a/artcraft-raveos/filmcraft/PKGBUILD b/artcraft-raveos/filmcraft/PKGBUILD
index 5a62687..b762dad 100644
--- a/artcraft-raveos/filmcraft/PKGBUILD
+++ b/artcraft-raveos/filmcraft/PKGBUILD
@@ -20,13 +20,21 @@ sha256sums=('7fb0bfef6dc50dc9c2281d0a3fff67df43f4cf5c1e5c2c94eb447b25cf783fb2')
 
 _srcenv() {
 	cd "$_archive"
-	export CARGO_HOME="$srcdir"
+	export CARGO_HOME="${ARTCRAFT_CARGO_HOME:-$srcdir}"
 	export CARGO_PROFILE_RELEASE_OPT_LEVEL=3
-	export CARGO_TARGET_DIR=target
+	export CARGO_TARGET_DIR="${ARTCRAFT_TARGET_DIR:-target}"
 	export RUSTUP_TOOLCHAIN=stable
 	CFLAGS+=' -fno-lto'
 }
 
+_jobs() {
+	local mem cpu
+	mem=$(awk '/MemAvailable/ {print int($2 / 2097152)}' /proc/meminfo)
+	cpu=$(nproc)
+	(( mem < 1 )) && mem=1
+	echo $(( mem < cpu ? mem : cpu ))
+}
+
 _icons=(512 256 128 64 48 32 16)
 
 prepare() {
@@ -36,14 +44,14 @@ prepare() {
 
 build() {
 	_srcenv
-	cargo build --frozen --release -j2
+	cargo build --frozen --release -j"$(_jobs)"
 }
 
 package() {
 	depends+=(libasound.so
 	          libgcc_s.so)
 	cd "$_archive"
-	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"{,-cli}
+	install -Dm0755 -t "$pkgdir/usr/bin/" "${ARTCRAFT_TARGET_DIR:-target}/release/$pkgname"{,-cli}
 	install -Dm0644 -t "$pkgdir/usr/share/applications/" "packaging/linux/ai.storyteller.$pkgname.desktop"
 	install -Dm0644 -t "$pkgdir/usr/share/mime/packages/" "packaging/linux/ai.storyteller.$pkgname.mime.xml"
 	install -Dm0644 -t "$pkgdir/usr/share/icons/hicolor/scalable/" assets/app-icon/hicolor/scalable/apps/ai.storyteller.$pkgname.svg
diff --git a/artcraft-raveos/lightcraft/PKGBUILD b/artcraft-raveos/lightcraft/PKGBUILD
index 83b3f0a..5cf4d67 100644
--- a/artcraft-raveos/lightcraft/PKGBUILD
+++ b/artcraft-raveos/lightcraft/PKGBUILD
@@ -19,13 +19,21 @@ sha256sums=('a1273f4a9f68694ff1778b81d6e6e7e9de78f326c711ab57489770e8c6b76bff')
 
 _srcenv() {
 	cd "$_archive"
-	export CARGO_HOME="$srcdir"
+	export CARGO_HOME="${ARTCRAFT_CARGO_HOME:-$srcdir}"
 	export CARGO_PROFILE_RELEASE_OPT_LEVEL=3
-	export CARGO_TARGET_DIR=target
+	export CARGO_TARGET_DIR="${ARTCRAFT_TARGET_DIR:-target}"
 	export RUSTUP_TOOLCHAIN=stable
 	CFLAGS+=' -fno-lto'
 }
 
+_jobs() {
+	local mem cpu
+	mem=$(awk '/MemAvailable/ {print int($2 / 2097152)}' /proc/meminfo)
+	cpu=$(nproc)
+	(( mem < 1 )) && mem=1
+	echo $(( mem < cpu ? mem : cpu ))
+}
+
 _icons=(512 256 128 64 48 32 16)
 
 prepare() {
@@ -35,13 +43,13 @@ prepare() {
 
 build() {
 	_srcenv
-	cargo build --frozen --release -j2
+	cargo build --frozen --release -j"$(_jobs)"
 }
 
 package() {
 	depends+=(libgcc_s.so)
 	cd "$_archive"
-	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"{,-cli}
+	install -Dm0755 -t "$pkgdir/usr/bin/" "${ARTCRAFT_TARGET_DIR:-target}/release/$pkgname"{,-cli}
 	install -Dm0644 -t "$pkgdir/usr/share/applications/" "packaging/linux/ai.storyteller.$pkgname.desktop"
 	install -Dm0644 -t "$pkgdir/usr/share/mime/packages/" "packaging/linux/ai.storyteller.$pkgname.mime.xml"
 	install -Dm0644 -t "$pkgdir/usr/share/icons/hicolor/scalable/" assets/app-icon/hicolor/scalable/apps/ai.storyteller.$pkgname.svg
diff --git a/artcraft-raveos/pdfcraft/PKGBUILD b/artcraft-raveos/pdfcraft/PKGBUILD
index 4a66092..4f56bf7 100644
--- a/artcraft-raveos/pdfcraft/PKGBUILD
+++ b/artcraft-raveos/pdfcraft/PKGBUILD
@@ -22,13 +22,21 @@ sha256sums=('26a90b1f617d03746f699b7b643df76d452c3cbb425bff613c824384e1362559')
 
 _srcenv() {
 	cd "$_archive"
-	export CARGO_HOME="$srcdir"
+	export CARGO_HOME="${ARTCRAFT_CARGO_HOME:-$srcdir}"
 	export CARGO_PROFILE_RELEASE_OPT_LEVEL=3
-	export CARGO_TARGET_DIR=target
+	export CARGO_TARGET_DIR="${ARTCRAFT_TARGET_DIR:-target}"
 	export RUSTUP_TOOLCHAIN=stable
 	CFLAGS+=' -fno-lto'
 }
 
+_jobs() {
+	local mem cpu
+	mem=$(awk '/MemAvailable/ {print int($2 / 2097152)}' /proc/meminfo)
+	cpu=$(nproc)
+	(( mem < 1 )) && mem=1
+	echo $(( mem < cpu ? mem : cpu ))
+}
+
 _icons=(512 256 128 64 48 32 16)
 
 prepare() {
@@ -38,13 +46,13 @@ prepare() {
 
 build() {
 	_srcenv
-	cargo build --frozen --release -j2
+	cargo build --frozen --release -j"$(_jobs)"
 }
 
 package() {
 	depends+=(libgcc_s.so)
 	cd "$_archive"
-	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"{,-cli}
+	install -Dm0755 -t "$pkgdir/usr/bin/" "${ARTCRAFT_TARGET_DIR:-target}/release/$pkgname"{,-cli}
 	install -Dm0644 -t "$pkgdir/usr/share/applications/" "packaging/linux/ai.storyteller.$pkgname.desktop"
 	install -Dm0644 -t "$pkgdir/usr/share/mime/packages/" "packaging/linux/ai.storyteller.$pkgname.mime.xml"
 	install -Dm0644 -t "$pkgdir/usr/share/icons/hicolor/scalable/" assets/app-icon/hicolor/scalable/apps/ai.storyteller.$pkgname.svg
diff --git a/artcraft-raveos/photocraft/PKGBUILD b/artcraft-raveos/photocraft/PKGBUILD
index df09555..a35f5df 100644
--- a/artcraft-raveos/photocraft/PKGBUILD
+++ b/artcraft-raveos/photocraft/PKGBUILD
@@ -19,13 +19,21 @@ sha256sums=('4be32507305f697b207d377f68492533473909bf922894840dd5bae5368e54ca')
 
 _srcenv() {
 	cd "$_archive"
-	export CARGO_HOME="$srcdir"
+	export CARGO_HOME="${ARTCRAFT_CARGO_HOME:-$srcdir}"
 	export CARGO_PROFILE_RELEASE_OPT_LEVEL=3
-	export CARGO_TARGET_DIR=target
+	export CARGO_TARGET_DIR="${ARTCRAFT_TARGET_DIR:-target}"
 	export RUSTUP_TOOLCHAIN=stable
 	CFLAGS+=' -fno-lto'
 }
 
+_jobs() {
+	local mem cpu
+	mem=$(awk '/MemAvailable/ {print int($2 / 2097152)}' /proc/meminfo)
+	cpu=$(nproc)
+	(( mem < 1 )) && mem=1
+	echo $(( mem < cpu ? mem : cpu ))
+}
+
 _icons=(512 256 128 64 48 32 16)
 
 prepare() {
@@ -35,13 +43,13 @@ prepare() {
 
 build() {
 	_srcenv
-	cargo build --frozen --release -j2
+	cargo build --frozen --release -j"$(_jobs)"
 }
 
 package() {
 	depends+=(libgcc_s.so)
 	cd "$_archive"
-	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"{,-cli}
+	install -Dm0755 -t "$pkgdir/usr/bin/" "${ARTCRAFT_TARGET_DIR:-target}/release/$pkgname"{,-cli}
 	install -Dm0644 -t "$pkgdir/usr/share/applications/" "packaging/linux/ai.storyteller.$pkgname.desktop"
 	install -Dm0644 -t "$pkgdir/usr/share/mime/packages/" "packaging/linux/ai.storyteller.$pkgname.mime.xml"
 	install -Dm0644 -t "$pkgdir/usr/share/icons/hicolor/scalable/" assets/app-icon/hicolor/scalable/apps/ai.storyteller.$pkgname.svg
diff --git a/artcraft-raveos/vectorcraft/PKGBUILD b/artcraft-raveos/vectorcraft/PKGBUILD
index 5c85845..16ed40d 100644
--- a/artcraft-raveos/vectorcraft/PKGBUILD
+++ b/artcraft-raveos/vectorcraft/PKGBUILD
@@ -19,13 +19,21 @@ sha256sums=('2e75236b5d1f779e21cd03f44b7486149afb272ad893b9db7d0cfff1beb51bee')
 
 _srcenv() {
 	cd "$_archive"
-	export CARGO_HOME="$srcdir"
+	export CARGO_HOME="${ARTCRAFT_CARGO_HOME:-$srcdir}"
 	export CARGO_PROFILE_RELEASE_OPT_LEVEL=3
-	export CARGO_TARGET_DIR=target
+	export CARGO_TARGET_DIR="${ARTCRAFT_TARGET_DIR:-target}"
 	export RUSTUP_TOOLCHAIN=stable
 	CFLAGS+=' -fno-lto'
 }
 
+_jobs() {
+	local mem cpu
+	mem=$(awk '/MemAvailable/ {print int($2 / 2097152)}' /proc/meminfo)
+	cpu=$(nproc)
+	(( mem < 1 )) && mem=1
+	echo $(( mem < cpu ? mem : cpu ))
+}
+
 _icons=(512 256 128 64 48 32 16)
 
 prepare() {
@@ -35,13 +43,13 @@ prepare() {
 
 build() {
 	_srcenv
-	cargo build --frozen --release -j2
+	cargo build --frozen --release -j"$(_jobs)"
 }
 
 package() {
 	depends+=(libgcc_s.so)
 	cd "$_archive"
-	install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"{,-cli}
+	install -Dm0755 -t "$pkgdir/usr/bin/" "${ARTCRAFT_TARGET_DIR:-target}/release/$pkgname"{,-cli}
 	install -Dm0644 -t "$pkgdir/usr/share/applications/" "packaging/linux/ai.storyteller.$pkgname.desktop"
 	install -Dm0644 -t "$pkgdir/usr/share/mime/packages/" "packaging/linux/ai.storyteller.$pkgname.mime.xml"
 	install -Dm0644 -t "$pkgdir/usr/share/icons/hicolor/scalable/" assets/app-icon/hicolor/scalable/apps/ai.storyteller.$pkgname.svg