From 5cce41e8fd6803e02145406c5a6d44eb4cb1dc49 Mon Sep 17 00:00:00 2001 From: shmyga Date: Thu, 8 Oct 2026 23:52:34 +0300 Subject: [PATCH] ci(action): update release action --- .env.default | 20 ++------------------ .gitea/workflows/release.yaml | 15 ++++++++++++--- .pm.toml | 11 ++++++++++- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.env.default b/.env.default index 3804f88..7d339b7 100644 --- a/.env.default +++ b/.env.default @@ -1,20 +1,4 @@ -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 -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" -DOCKER_PROJECTS="$PROJECT-web:web" -DOCKER_ARGS="PROJECT_NAME=$PROJECT" \ No newline at end of file + +PUBLISH_REPO=https://git.shmyga.ru/api/packages/InfernalGames diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 8a61283..ddae2ef 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -1,8 +1,12 @@ name: release -on: push +on: + push: + tags: ["*"] env: + PUBLISH_USER: ${{ vars.PUBLISH_USERNAME }} + PUBLISH_PASSWORD: ${{ secrets.PUBLISH_TOKEN }} KEY_STORE: keystore.jks KEY_PASS: ${{ secrets.KEY_PASS }} @@ -33,5 +37,10 @@ jobs: path: | $HOME/sdk ./build - #- run: pm publish:docker -vv - #- run: pm publish:gitea -vv + - uses: docker/login-action@v4 + with: + registry: git.shmyga.ru + username: ${{ vars.PUBLISH_USERNAME }} + password: ${{ secrets.PUBLISH_TOKEN }} + - run: pm publish:docker -vv + - run: pm publish:gitea -vv diff --git a/.pm.toml b/.pm.toml index 2b902f9..c6d4c64 100644 --- a/.pm.toml +++ b/.pm.toml @@ -1,7 +1,16 @@ modules = ["."] +#[presets.haxe] +#variables.haxe_sources = [ +# "./src/common/haxe", +# "./src/app/haxe", +# "./src/server/haxe", +#] +#tasks = {} + [presets.docker] variables.docker_target = "web" +variables.docker_build_args = { PROJECT_NAME = "{{ project_name }}" } variables.docker_name = "{{ project_name }}-web" [presets.docker.tasks.build.compose] @@ -12,7 +21,7 @@ variables.build_path = "{{ 'BUILD_PATH' | env('./build') }}" variables.target_path = "{{ 'TARGET_PATH' | env('./target') }}" commands = [ "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", + "PROJECT={{ project_name }} SDK_PATH={{ sdk_path }} BUILD_PATH={{ build_path }} TARGET_PATH={{ target_path }} PUBLISH_PATH={{ publish_path }} docker compose run --rm --user $(id -u):$(id -g) --build --remove-orphans builder", ] [presets.gitea]