build: Try to fix "copy_artifacts"

debils-tech · Sep 15, 2024 · be80700 · be80700
1 parent cc3ee30
commit be80700
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -20,7 +20,6 @@ test:
 	flutter test
 
 build-android:
-	rm -rf build/releases/android
 	flutter build apk --flavor prod --split-per-abi
 	flutter build apk --flavor prod
 	#flutter build appbundle --flavor prod

diff --git a/tools/android/move-builds.sh b/tools/android/move-builds.sh
@@ -6,19 +6,17 @@ RELEASE_DIR="build/releases/android"
 APP_NAME="not_zero-android"
 
 : "${TAG:=release}"
-VERSION=$(sh tools/get-version.sh)
+VERSION=$(tools/get-version.sh)
 BUILD_TAG="$VERSION-$TAG"
 
-alias copy_artifact="sh tools/copy_artifact.sh"
-
 mkdir -p $RELEASE_DIR
 rm -f $RELEASE_DIR/*
 
-copy_artifact $APK_DIR/app-arm64-v8a-prod-release.apk $RELEASE_DIR/$APP_NAME-arm64-v8a-"$BUILD_TAG".apk &
-copy_artifact $APK_DIR/app-armeabi-v7a-prod-release.apk $RELEASE_DIR/$APP_NAME-armeabi-v7a-"$BUILD_TAG".apk &
-copy_artifact $APK_DIR/app-x86_64-prod-release.apk $RELEASE_DIR/$APP_NAME-x86_64-"$BUILD_TAG".apk &
-copy_artifact $APK_DIR/app-prod-release.apk $RELEASE_DIR/$APP_NAME-multiabi-"$BUILD_TAG".apk &
-copy_artifact $AAB_DIR/app-prod-release.aab $RELEASE_DIR/$APP_NAME-"$BUILD_TAG".aab
+tools/copy-artifact.sh $APK_DIR/app-arm64-v8a-prod-release.apk $RELEASE_DIR/$APP_NAME-arm64-v8a-"$BUILD_TAG".apk &
+tools/copy-artifact.sh $APK_DIR/app-armeabi-v7a-prod-release.apk $RELEASE_DIR/$APP_NAME-armeabi-v7a-"$BUILD_TAG".apk &
+tools/copy-artifact.sh $APK_DIR/app-x86_64-prod-release.apk $RELEASE_DIR/$APP_NAME-x86_64-"$BUILD_TAG".apk &
+tools/copy-artifact.sh $APK_DIR/app-prod-release.apk $RELEASE_DIR/$APP_NAME-multiabi-"$BUILD_TAG".apk &
+tools/copy-artifact.sh $AAB_DIR/app-prod-release.aab $RELEASE_DIR/$APP_NAME-"$BUILD_TAG".aab
 
 wait
 

diff --git a/tools/copy_artifact.sh → tools/copy-artifact.sh b/tools/copy_artifact.sh → tools/copy-artifact.sh
diff --git a/tools/linux/move-builds.sh b/tools/linux/move-builds.sh
@@ -5,16 +5,14 @@ RELEASE_DIR="build/releases/linux"
 APP_NAME="not_zero-linux"
 
 : "${TAG:=release}"
-VERSION=$(sh tools/get-version.sh)
+VERSION=$(tools/get-version.sh)
 BUILD_TAG="$VERSION-$TAG"
 
-alias copy_artifact="sh tools/copy_artifact.sh"
-
 mkdir -p $RELEASE_DIR
 rm -f $RELEASE_DIR/*
 
 (cd $LINUX_DIR && tar -cz bundle -f bundle.tar.gz)
-copy_artifact $LINUX_DIR/bundle.tar.gz $RELEASE_DIR/$APP_NAME-x86_64-"$BUILD_TAG".tar.gz
+tools/copy-artifact.sh $LINUX_DIR/bundle.tar.gz $RELEASE_DIR/$APP_NAME-x86_64-"$BUILD_TAG".tar.gz
 
 echo -e "\033[92m ✔️ Linux builds copied into \"$RELEASE_DIR\":\033[0m"
 ls $RELEASE_DIR -1hs