Author SHA1 Message Date
shmyga 93c79b40b8 build(gulp): update gulp-haxetool 2026-10-25 13:16:55 +03:00
22 changed files with 1854 additions and 474 deletions
+15 -16
View File
@@ -17,27 +17,26 @@ jobs:
- uses: actions/checkout@v7 - uses: actions/checkout@v7
- run: echo '' > requirements.txt - run: echo '' > requirements.txt
- uses: https://git.shmyga.ru/InfernalGames/project-manager@master - uses: https://git.shmyga.ru/InfernalGames/project-manager@master
- uses: actions/cache/restore@v6 - name: Restore haxe cache
id: cache-haxe id: cache-haxe-restore
uses: actions/cache/restore@v6
with: with:
key: ${{ runner.os }}-haxe-${{ hashFiles('**/haxetool.json') }}-v1 key: ${{ runner.os }}-haxe
path: /root/sdk path: |
- uses: actions/cache/restore@v6 $HOME/sdk
id: cache-haxe-build ./build
with:
key: ${{ runner.os }}-haxe-build
path: ./build
- run: echo "${{ secrets.KEY_STORE }}" | base64 --decode > keystore.jks - run: echo "${{ secrets.KEY_STORE }}" | base64 --decode > keystore.jks
- run: pm build:docker -vv - run: pm build:docker -vv
- if: steps.cache-haxe.outputs.cache-hit != 'true' - name: Save haxe cache
id: cache-haxe-save
#if: always() && steps.cache-haxe-restore.outputs.cache-hit != 'true'
if: always()
uses: actions/cache/save@v6 uses: actions/cache/save@v6
with: with:
key: ${{ steps.cache-haxe.outputs.cache-primary-key }} key: ${{ steps.cache-haxe-restore.outputs.cache-primary-key }}
path: /root/sdk path: |
- uses: actions/cache/save@v6 $HOME/sdk
with: ./build
key: ${{ steps.cache-haxe-build.outputs.cache-primary-key }}
path: ./build
- uses: docker/login-action@v4 - uses: docker/login-action@v4
with: with:
registry: git.shmyga.ru registry: git.shmyga.ru
-14
View File
@@ -1,14 +0,0 @@
name: test
on: push
jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v7
- run: echo '' > requirements.txt
- uses: https://git.shmyga.ru/InfernalGames/project-manager@haxetool
with:
setup-haxetool: true
- run: pm lint -vv
+11 -2
View File
@@ -1,5 +1,13 @@
modules = ["."] modules = ["."]
#[presets.haxe]
#variables.haxe_sources = [
# "./src/common/haxe",
# "./src/app/haxe",
# "./src/server/haxe",
#]
#tasks = {}
[presets.docker] [presets.docker]
variables.docker_target = "web" variables.docker_target = "web"
variables.docker_build_args = { PROJECT_NAME = "{{ project_name }}" } variables.docker_build_args = { PROJECT_NAME = "{{ project_name }}" }
@@ -8,11 +16,12 @@ variables.docker_name = "{{ project_name }}-web"
[presets.docker.tasks.build.compose] [presets.docker.tasks.build.compose]
priority = 1 priority = 1
variables.sdk_path = "{{ 'SDK_PATH' | env('$HOME/sdk') }}" variables.sdk_path = "{{ 'SDK_PATH' | env('$HOME/sdk') }}"
variables.publish_path = "{{ 'PUBLISH_PATH' | env('$HOME/public/' + project_name) }}"
variables.build_path = "{{ 'BUILD_PATH' | env('./build') }}" variables.build_path = "{{ 'BUILD_PATH' | env('./build') }}"
variables.target_path = "{{ 'TARGET_PATH' | env('./target') }}" variables.target_path = "{{ 'TARGET_PATH' | env('./target') }}"
commands = [ commands = [
"mkdir -p \"{{ sdk_path }}\" \"{{ build_path }}\" \"{{ target_path }}\" \"src-gen\"", "mkdir -p \"{{ sdk_path }}\" \"{{ publish_path }}\" \"{{ build_path }}\" \"{{ target_path }}\" \"src-gen\"",
"PROJECT={{ project_name }} SDK_PATH={{ sdk_path }} BUILD_PATH={{ build_path }} TARGET_PATH={{ target_path }} 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] [presets.gitea]
+6 -6
View File
@@ -1,8 +1,8 @@
FROM ubuntu:resolute AS base FROM ubuntu:noble AS base
RUN apt update && apt install -y \ RUN apt update && apt install -y \
nodejs \ nodejs \
npm \ npm \
openjdk-17-jre \ openjdk-11-jre \
protobuf-compiler \ protobuf-compiler \
jq jq
RUN node -v RUN node -v
@@ -14,18 +14,18 @@ WORKDIR /app
COPY package.json package-lock.json ./ COPY package.json package-lock.json ./
RUN --mount=type=cache,target=/root/.npm \ RUN --mount=type=cache,target=/root/.npm \
npm ci npm ci
COPY haxetool.json protohx.json ./ COPY gulpfile.ts protohx.json ./
COPY config.example.json ./config.example.json COPY config.example.json ./config.example.json
RUN --mount=type=secret,id=KEY_STORE \ RUN --mount=type=secret,id=KEY_STORE \
cat /run/secrets/KEY_STORE > ./key.jks cat /run/secrets/KEY_STORE > ./key.jks
RUN --mount=type=secret,id=KEY_PASS \ RUN --mount=type=secret,id=KEY_PASS \
jq --arg key_pass "$(cat /run/secrets/KEY_PASS)" \ jq --arg key_pass "$(cat /run/secrets/KEY_PASS)" \
'.SdkDir = "/sdk" | .Key.store = "key.jks" | .Key.pass = $key_pass' \ '.SdkDir = "/sdk" | .PublishDir = "/app/publish" | .Key.store = "key.jks" | .Key.pass = $key_pass' \
config.example.json > config.json config.example.json > config.json
COPY src ./src COPY src ./src
COPY dependencies ./dependencies COPY dependencies ./dependencies
VOLUME ["/sdk", "/app/build", "/app/target", "/app/src-gen"] VOLUME ["/sdk", "/app/build", "/app/target", "/app/publish", "/app/src-gen"]
CMD ["npm", "run", "build"] CMD ["npx", "gulp", "default"]
FROM hello-world AS web FROM hello-world AS web
ARG PROJECT_NAME ARG PROJECT_NAME
+2
View File
@@ -1,4 +1,6 @@
{ {
"SdkDir": "$HOME/sdk",
"Develop": false,
"UseRuffle": true, "UseRuffle": true,
"Key": { "Key": {
"store": "keystore.jks", "store": "keystore.jks",
@@ -1,2 +1,3 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="ru.m.android" /> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="ru.m.android">
</manifest>
-22
View File
@@ -1,22 +0,0 @@
buildscript {
repositories {
mavenCentral()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:::ANDROID_GRADLE_PLUGIN::'
}
}
apply plugin: 'com.android.library'
android {
namespace "ru.m.android"
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
}
dependencies {
implementation project(':deps:extension-api')
}
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="android" default="help">
<property environment="env" />
<property name="sdk.dir" value="${env.ANDROID_SDK}" />
<property file="local.properties" />
<property file="ant.properties" />
<property file="project.properties" />
<import file="${sdk.dir}/tools/ant/build.xml" />
</project>
+3
View File
@@ -0,0 +1,3 @@
android.library=true
android.library.reference.1=../extension-api
target=android-::ANDROID_TARGET_SDK_VERSION::
+1
View File
@@ -13,6 +13,7 @@ services:
- ${SDK_PATH}:/sdk - ${SDK_PATH}:/sdk
- ${BUILD_PATH}:/app/build - ${BUILD_PATH}:/app/build
- ${TARGET_PATH}:/app/target - ${TARGET_PATH}:/app/target
- ${PUBLISH_PATH}:/app/publish
- ./src-gen:/app/src-gen - ./src-gen:/app/src-gen
secrets: secrets:
+8
View File
@@ -0,0 +1,8 @@
import gulp from "gulp";
import { Preset } from "gulp-haxetool";
import config from "./config.json" with { type: "json" };
import presetData from "./haxetool.json" with { type: "json" };
import packageInfo from "./package.json" with { type: "json" };
const preset = new Preset(presetData, config, packageInfo);
export default preset.register(gulp);
+6 -10
View File
@@ -1,5 +1,6 @@
{ {
"default": { "default": {
"config": {
"meta": { "meta": {
"title": "Puzzle'z", "title": "Puzzle'z",
"filename": "puzzlez", "filename": "puzzlez",
@@ -10,16 +11,6 @@
"version": "<%=package.version%>" "version": "<%=package.version%>"
}, },
"sources": ["src-gen/haxe", "src/common/haxe"], "sources": ["src-gen/haxe", "src/common/haxe"],
"libs": {
"haxework": "2.1.0",
"lime": "8.3.2",
"openfl": "9.5.2",
"hxcpp": "4.2.1",
"svg": "1.1.3",
"protohx": "0.4.6",
"yield": "3.2.2",
"formatter": "1.16.0"
},
"key": { "key": {
"store": "<%=config.Key.store%>", "store": "<%=config.Key.store%>",
"pass": "<%=config.Key.pass%>" "pass": "<%=config.Key.pass%>"
@@ -30,10 +21,12 @@
"CompilationOption.set('PIXABAY_KEY','<%=config.PixabayKey%>')" "CompilationOption.set('PIXABAY_KEY','<%=config.PixabayKey%>')"
], ],
"flags": ["proto_debug"] "flags": ["proto_debug"]
}
}, },
"app": { "app": {
"buildSystem": "openfl", "buildSystem": "openfl",
"platforms": ["flash", "html5", "linux", "windows", "android"], "platforms": ["flash", "html5", "linux", "windows", "android"],
"config": {
"sources": ["src/app/haxe"], "sources": ["src/app/haxe"],
"android": [ "android": [
{ {
@@ -52,11 +45,14 @@
"CompilationOption.set('port',<%=env.PORT || '5000'%>)" "CompilationOption.set('port',<%=env.PORT || '5000'%>)"
], ],
"flags": ["app"] "flags": ["app"]
}
}, },
"server": { "server": {
"buildSystem": "haxe", "buildSystem": "haxe",
"platforms": ["cpp"], "platforms": ["cpp"],
"config": {
"sources": ["src/server/haxe"], "sources": ["src/server/haxe"],
"main": "ru.m.puzzlez.PuzzlezServer" "main": "ru.m.puzzlez.PuzzlezServer"
} }
} }
}
-1
View File
@@ -1,5 +1,4 @@
{ {
"excludes": ["src-gen"],
"indentation": { "indentation": {
"character": " " "character": " "
}, },
+1621 -353
View File
File diff suppressed because it is too large Load Diff
+16 -6
View File
@@ -3,12 +3,22 @@
"type": "module", "type": "module",
"version": "0.6.2", "version": "0.6.2",
"scripts": { "scripts": {
"build": "hxt default", "build": "gulp",
"dev": "hxt app:flash:test", "dev": "gulp app:flash:test"
"lint": "hxt check --verbose",
"format": "hxt format"
}, },
"devDependencies": { "devDependencies": {
"gulp-haxetool": "^2.1.0" "gulp-cli": "^3.1.0",
} "gulp-haxetool": "^1.2.0"
},
"haxeDependencies": {
"haxework": "2.1.0",
"lime": "8.0.0",
"openfl": "9.2.0",
"hxcpp": "4.2.1",
"svg": "1.1.3",
"protohx": "0.4.6",
"yield": "3.2.2",
"formatter": "1.16.0"
},
"haxe": "4.2.5"
} }
+1 -1
View File
@@ -27,7 +27,7 @@
{ {
"args": ["${input:target}"], "args": ["${input:target}"],
"name": "${input:target}", "name": "${input:target}",
"program": "${workspaceFolder}/node_modules/.bin/hxt", "program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
"request": "launch", "request": "launch",
"skipFiles": ["<node_internals>/**"], "skipFiles": ["<node_internals>/**"],
"type": "node", "type": "node",
Executable
+9
View File
@@ -0,0 +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
./scripts/docker-action
+45
View File
@@ -0,0 +1,45 @@
#!/usr/bin/env bash
set -e
cd "$(dirname $(dirname "$0"))" || exit
. .env
build () {
echo "build: $1"
. "$1/.env"
for PROJECT in "${DOCKER_PROJECTS[@]}"; do
IFS=: read -r PROJECT_NAME PROJECT_TARGET <<< "$PROJECT"
ARGS=("build")
for ARG in ${DOCKER_ARGS[@]}; do
ARGS+=("--build-arg" "$ARG")
done
if [ -n "$PROJECT_TARGET" ]; then
ARGS+=("--target" "$PROJECT_TARGET")
fi
ARGS+=("-t" "$DOCKER_GROUP/$PROJECT_NAME" ".")
ARGS+=("-f" "$1/Dockerfile")
echo "${ARGS[@]}"
docker "${ARGS[@]}"
done
}
publish () {
echo "publish: $1"
. "$1/.env"
for PROJECT in "${DOCKER_PROJECTS[@]}"; do
IFS=: read -r PROJECT_NAME PROJECT_TARGET <<< "$PROJECT"
docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:$VERSION
docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:latest
docker push $DOCKER_ROOT/$PROJECT_NAME:$VERSION
docker push $DOCKER_ROOT/$PROJECT_NAME:latest
done
}
DEFAULT_TARGETS="."
TARGETS="${@-$DEFAULT_TARGETS}"
DOCKER_ACTION="${DOCKER_ACTION-build}"
for TARGET in $TARGETS; do
$DOCKER_ACTION "$TARGET"
done
+35
View File
@@ -0,0 +1,35 @@
#!/usr/bin/env bash
set -e
cd "$(dirname $(dirname "$0"))" || exit
source .env
PACKAGES=(
"android/${PROJECT}_${VERSION}.apk"
"debian/${PROJECT}_${VERSION}_all.deb"
"archive/${PROJECT}_${VERSION}_linux.tar.gz"
"archive/${PROJECT}_${VERSION}_win.zip"
"installer/${PROJECT}_${VERSION}.exe"
)
for PACKAGE in "${PACKAGES[@]}"
do
if [ -f "${PUBLISH_PATH}/${PACKAGE}" ]; then
PACKAGE_NAME=$(basename "$PACKAGE")
echo "publish: $PACKAGE"
curl --user "${PUBLISH_USER}:${PUBLISH_PASSWORD}" -X DELETE \
"${REPO}/generic/${PROJECT}/${VERSION}/${PACKAGE_NAME}"
curl --user "${PUBLISH_USER}:${PUBLISH_PASSWORD}" \
--upload-file "${PUBLISH_PATH}/${PACKAGE}" \
"${REPO}/generic/${PROJECT}/${VERSION}/${PACKAGE_NAME}"
if [[ "$PACKAGE" == *.deb ]]; then
curl --user "${PUBLISH_USER}:${PUBLISH_PASSWORD}" -X DELETE \
"${REPO}/debian/pool/noble/main/${PROJECT}/${VERSION}/all"
curl --user "${PUBLISH_USER}:${PUBLISH_PASSWORD}" \
--upload-file "${PUBLISH_PATH}/${PACKAGE}" \
"${REPO}/debian/pool/noble/main/upload"
fi
fi
done
DOCKER_ACTION=publish ./scripts/docker-action
Executable
+5
View File
@@ -0,0 +1,5 @@
#!/usr/bin/env bash
set -e
cd "$(dirname $(dirname "$0"))" || exit
npm ci
@@ -16,8 +16,23 @@ import ru.m.puzzlez.render.Background;
@:singleton @:template class BackgroundPopup extends PopupView<Background> { @:singleton @:template class BackgroundPopup extends PopupView<Background> {
private static var colorsList:Array<Color> = [ private static var colorsList:Array<Color> = [
'#FFFFFF', '#001f3f', '#0074D9', '#7FDBFF', '#39CCCC', '#3D9970', '#2ECC40', '#01FF70', '#FFDC00', '#FF851B', '#FFFFFF',
'#FF4136', '#85144b', '#F012BE', '#B10DC9', '#111111', '#AAAAAA', '#DDDDDD', '#001f3f',
'#0074D9',
'#7FDBFF',
'#39CCCC',
'#3D9970',
'#2ECC40',
'#01FF70',
'#FFDC00',
'#FF851B',
'#FF4136',
'#85144b',
'#F012BE',
'#B10DC9',
'#111111',
'#AAAAAA',
'#DDDDDD',
]; ];
@:view("selected") var selectedView:SpriteView; @:view("selected") var selectedView:SpriteView;