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..35acc441 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: | @@ -66,17 +66,18 @@ 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 with: repository: yaoapp/xgen - ref: 408470b84c9d6bb8ed988b545b6e46ffc2872014 + # ref: 408470b84c9d6bb8ed988b545b6e46ffc2872014 path: xgen-v1.0 - name: Checkout Yao-Init @@ -87,15 +88,19 @@ 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 ../ + rm -f ../xgen-v1.0/packages/setup/vite.config.ts.* ls -l . ls -l ../ + ls -l ../xgen-v1.0/packages/setup/ - name: Checkout Code uses: actions/checkout@v2 diff --git a/Makefile b/Makefile index 4afc4b16..aff8d492 100644 --- a/Makefile +++ b/Makefile @@ -167,10 +167,6 @@ bindata: 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 - # Building XGEN v1.0 export NODE_ENV=production rm -f ../xgen-v1.0/pnpm-lock.yaml @@ -218,13 +214,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