From 29b269c971c60767eaedaf2231d71d296520490f Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 16 Dec 2022 13:33:53 +0800 Subject: [PATCH 1/6] [_] workflow --- .github/workflows/release-linux.yml | 13 ++++++++----- .github/workflows/release-macos.yml | 13 ++++++++----- Makefile | 11 ++--------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index b37f9c9b..50d37670 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -71,11 +71,12 @@ jobs: ref: 5e91d3d9dcabd2986f901b6b31590e49fc3c4dd8 path: v8go - - name: Checkout XGen v0.9 - uses: actions/checkout@v2 + - name: Download XGen v0.9 + uses: dsaltares/fetch-gh-release-asset@master with: - repository: yaoapp/xgen-deprecated - path: xgen-v0.9 + repo: "yaoapp/xgen-deprecated" + version: "tags/v0.9.0" + file: "xgen-v0.9-dist.tar.gz" - name: Checkout XGen v1.0 uses: actions/checkout@v2 @@ -92,11 +93,13 @@ jobs: - name: Move Kun, Xun, Gou, UI, V8Go run: | + tar xvfz xgen-v0.9-dist.tar.gz + rm xgen-v0.9-dist.tar.gz mv kun ../ mv xun ../ mv gou ../ mv v8go ../ - mv xgen-v0.9 ../ + mv v0.9 ../xgen-v0.9 mv xgen-v1.0 ../ mv yao-init ../ ls -l . diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 857622a1..26217978 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -66,11 +66,12 @@ jobs: ref: 5e91d3d9dcabd2986f901b6b31590e49fc3c4dd8 path: v8go - - name: Checkout XGen v0.9 - uses: actions/checkout@v2 + - name: Download XGen v0.9 + uses: dsaltares/fetch-gh-release-asset@master with: - repository: yaoapp/xgen-deprecated - path: xgen-v0.9 + repo: "yaoapp/xgen-deprecated" + version: "tags/v0.9.0" + file: "xgen-v0.9-dist.tar.gz" - name: Checkout XGen v1.0 uses: actions/checkout@v2 @@ -87,11 +88,13 @@ jobs: - name: Move Kun, Xun, Gou, UI, V8Go run: | + tar xvfz xgen-v0.9-dist.tar.gz + rm xgen-v0.9-dist.tar.gz mv kun ../ mv xun ../ mv gou ../ mv v8go ../ - mv xgen-v0.9 ../ + mv v0.9 ../xgen-v0.9 mv xgen-v1.0 ../ mv yao-init ../ ls -l . diff --git a/Makefile b/Makefile index 4afc4b16..9d66bb0b 100644 --- a/Makefile +++ b/Makefile @@ -165,11 +165,8 @@ bindata: # make artifacts-linux .PHONY: artifacts-linux artifacts-linux: clean - mkdir -p dist/release -# Building XGEN v0.9 - sed -ie "s/url('\/icon/url('\/xiang\/icon/g" ../xgen-v0.9/public/icon/md_icon.css - cd ../xgen-v0.9 && npm install && npm run build + mkdir -p dist/release # Building XGEN v1.0 export NODE_ENV=production @@ -218,13 +215,9 @@ artifacts-linux: clean # make artifacts-macos .PHONY: artifacts-macos artifacts-macos: clean + mkdir -p dist/release - -# Building XGEN v0.9 - sed -ie "s/url('\/icon/url('\/xiang\/icon/g" ../xgen-v0.9/public/icon/md_icon.css - cd ../xgen-v0.9 && npm install && npm run build - # Building XGEN v1.0 export NODE_ENV=production rm -f ../xgen-v1.0/pnpm-lock.yaml From 4de938335a764f0c27bfec132cdadfbaa44884da Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 16 Dec 2022 13:50:00 +0800 Subject: [PATCH 2/6] [_] --- .github/workflows/release-macos.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 26217978..8d7aed32 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -97,6 +97,7 @@ jobs: mv v0.9 ../xgen-v0.9 mv xgen-v1.0 ../ mv yao-init ../ + rm ../xgen-v1.0/packages/setup/vite.config.ts.* ls -l . ls -l ../ From 625f93a22991935592c5a6d8b6b44e6dae044245 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 16 Dec 2022 13:53:11 +0800 Subject: [PATCH 3/6] [_] --- .github/workflows/release-macos.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 8d7aed32..bfc14bad 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -97,9 +97,10 @@ jobs: mv v0.9 ../xgen-v0.9 mv xgen-v1.0 ../ mv yao-init ../ - rm ../xgen-v1.0/packages/setup/vite.config.ts.* + rm -f ../xgen-v1.0/packages/setup/vite.config.ts.* ls -l . ls -l ../ + ls -l ../xgen-v1.0/packages/ - name: Checkout Code uses: actions/checkout@v2 From 3f74b1737b245d5e4b66c63ae43d8ffb88a529d0 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 16 Dec 2022 14:01:43 +0800 Subject: [PATCH 4/6] [_] --- .github/workflows/release-macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index bfc14bad..97269bb6 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: go: [1.19.2] - runs-on: "macos-11" + runs-on: "macos-12" steps: - name: Install coscmd run: | @@ -100,7 +100,7 @@ jobs: rm -f ../xgen-v1.0/packages/setup/vite.config.ts.* ls -l . ls -l ../ - ls -l ../xgen-v1.0/packages/ + ls -l ../xgen-v1.0/packages/setup/ - name: Checkout Code uses: actions/checkout@v2 From 89ca3133bf25277132f7db4da421c843713cedc2 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 16 Dec 2022 14:15:30 +0800 Subject: [PATCH 5/6] [_] --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9d66bb0b..099c7a69 100644 --- a/Makefile +++ b/Makefile @@ -222,10 +222,15 @@ artifacts-macos: clean export NODE_ENV=production rm -f ../xgen-v1.0/pnpm-lock.yaml echo "BASE=__yao_admin_root" > ../xgen-v1.0/packages/xgen/.env - cd ../xgen-v1.0 && pnpm install && pnpm run build + cd ../xgen-v1.0 && pnpm install + cd ../xgen-v1.0/packages/actionflow && pnpm install + cd ../xgen-v1.0/packages/storex && pnpm install + cd ../xgen-v1.0/packages/xgen && pnpm install + cd ../xgen-v1.0/packages/setup && pnpm install + cd ../xgen-v1.0 && pnpm run build # Setup UI - cd ../xgen-v1.0/packages/setup && pnpm install && pnpm run build + cd ../xgen-v1.0/packages/setup && pnpm run build # Init Application cd ../yao-init rm -rf .git From 4707c17518d86bc4e3dc21b1619a32eebfa96392 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 16 Dec 2022 14:20:59 +0800 Subject: [PATCH 6/6] [_] --- .github/workflows/release-macos.yml | 2 +- Makefile | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 97269bb6..35acc441 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -77,7 +77,7 @@ jobs: uses: actions/checkout@v2 with: repository: yaoapp/xgen - ref: 408470b84c9d6bb8ed988b545b6e46ffc2872014 + # ref: 408470b84c9d6bb8ed988b545b6e46ffc2872014 path: xgen-v1.0 - name: Checkout Yao-Init diff --git a/Makefile b/Makefile index 099c7a69..aff8d492 100644 --- a/Makefile +++ b/Makefile @@ -165,7 +165,6 @@ bindata: # make artifacts-linux .PHONY: artifacts-linux artifacts-linux: clean - mkdir -p dist/release # Building XGEN v1.0 @@ -222,15 +221,10 @@ artifacts-macos: clean export NODE_ENV=production rm -f ../xgen-v1.0/pnpm-lock.yaml echo "BASE=__yao_admin_root" > ../xgen-v1.0/packages/xgen/.env - cd ../xgen-v1.0 && pnpm install - cd ../xgen-v1.0/packages/actionflow && pnpm install - cd ../xgen-v1.0/packages/storex && pnpm install - cd ../xgen-v1.0/packages/xgen && pnpm install - cd ../xgen-v1.0/packages/setup && pnpm install - cd ../xgen-v1.0 && pnpm run build + cd ../xgen-v1.0 && pnpm install && pnpm run build # Setup UI - cd ../xgen-v1.0/packages/setup && pnpm run build + cd ../xgen-v1.0/packages/setup && pnpm install && pnpm run build # Init Application cd ../yao-init rm -rf .git