diff --git a/.env.default b/.env.default index 7916893..a17bbc5 100644 --- a/.env.default +++ b/.env.default @@ -1,21 +1,20 @@ PROJECT=puzzlez +VERSION=$(grep -m 1 'version' ./package.json | grep -oP '"version"\s*:\s*"\K\d+\.\d+.\d+') SDK_PATH=$HOME/sdk PUBLISH_PATH=$HOME/public/$PROJECT BUILD_PATH=./build TARGET_PATH=./target KEY_STORE= KEY_PASS= + +# publish REPO=https://git.shmyga.ru/api/packages/InfernalGames PUBLISH_USER= PUBLISH_PASSWORD= +# docker DOCKER_REPO=git.shmyga.ru DOCKER_GROUP=infernalgames DOCKER_ROOT="$DOCKER_REPO/$DOCKER_GROUP" -VERSION=$(grep -m 1 'version' ./package.json | grep -oP '"version"\s*:\s*"\K\d+\.\d+.\d+') -DOCKER_PROJECTS=( - "$PROJECT-web:web" -) -DOCKER_ARGS=( - "PROJECT_NAME=$PROJECT" -) \ No newline at end of file +DOCKER_PROJECTS="$PROJECT-web:web" +DOCKER_ARGS="PROJECT_NAME=$PROJECT" \ No newline at end of file diff --git a/scripts/build b/scripts/build index bb4faf4..b52ca64 100755 --- a/scripts/build +++ b/scripts/build @@ -1,7 +1,9 @@ #!/usr/bin/env bash set -e cd "$(dirname $(dirname "$0"))" || exit - source .env + mkdir -p "$SDK_PATH" "$PUBLISH_PATH" "$BUILD_PATH" "$TARGET_PATH" "src-gen" -docker compose run --rm --user $(id -u):$(id -g) --build --remove-orphans builder \ No newline at end of file +docker compose run --rm --user $(id -u):$(id -g) --build --remove-orphans builder + +./scripts/docker-action \ No newline at end of file diff --git a/scripts/publish b/scripts/publish index 81d1ac1..7ac09e6 100755 --- a/scripts/publish +++ b/scripts/publish @@ -3,8 +3,6 @@ set -e cd "$(dirname $(dirname "$0"))" || exit source .env -VERSION=$(grep -m 1 'version' ./package.json | grep -oP '"version"\s*:\s*"\K\d+\.\d+\.\d+') - PACKAGES=( "android/${PROJECT}_${VERSION}.apk" "debian/${PROJECT}_${VERSION}_all.deb" @@ -32,4 +30,6 @@ do "${REPO}/debian/pool/noble/main/upload" fi fi -done \ No newline at end of file +done + +DOCKER_ACTION=publish ./scripts/docker-action \ No newline at end of file