From f2a9598c5cf4e960dfdb438c65fba3464df2064b Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 4 Jul 2024 11:44:09 +0800 Subject: [PATCH] refactor: Update Docker image versions and artifact upload actions --- .github/workflows/build-linux.yml | 9 +- .github/workflows/build-macos.yml | 32 +--- .github/workflows/pr-test.yml | 29 ++-- .../workflows/release-v0.10.3-pre-docker.yml | 86 ---------- .../workflows/release-v0.10.3-pre-linux.yml | 155 ----------------- .../workflows/release-v0.10.3-pre-macos.yml | 156 ------------------ .github/workflows/unit-test.yml | 29 ++-- .github/workflows/v0.10.3-release-docker.yml | 84 ---------- .github/workflows/v0.10.3-release-linux.yml | 143 ---------------- .github/workflows/v0.10.3-release-macos.yml | 139 ---------------- Makefile | 44 +++-- 11 files changed, 73 insertions(+), 833 deletions(-) delete mode 100644 .github/workflows/release-v0.10.3-pre-docker.yml delete mode 100644 .github/workflows/release-v0.10.3-pre-linux.yml delete mode 100644 .github/workflows/release-v0.10.3-pre-macos.yml delete mode 100644 .github/workflows/v0.10.3-release-docker.yml delete mode 100644 .github/workflows/v0.10.3-release-linux.yml delete mode 100644 .github/workflows/v0.10.3-release-macos.yml diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 2b04f64f..64427d04 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -12,12 +12,11 @@ jobs: container: # DockerFile # https://github.com/YaoApp/yao/blob/main/docker/build/Dockerfile - image: yaoapp/yao-build:0.10.4 + image: yaoapp/yao-build:0.10.4 steps: - - name: Install Coscmd - run: | + run: | apt-get install -y python3-venv python3 -m venv /python3/venv /python3/venv/bin/python -m pip install coscmd @@ -40,7 +39,7 @@ jobs: ls -l /data - name: Archive production artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: yao-linux path: | @@ -48,4 +47,4 @@ jobs: - name: Push To Silicon Valley run: | - for file in /data/*; do /python3/venv/bin/coscmd upload $file /archives/; done; \ No newline at end of file + for file in /data/*; do /python3/venv/bin/coscmd upload $file /archives/; done; diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index ab849781..1e37adf7 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -50,7 +50,6 @@ jobs: uses: actions/checkout@v3 with: repository: yaoapp/gou - # ref: dc3d98411f61e21cf775e4c82d92d5ac2acfc03c path: gou - name: Checkout V8Go @@ -61,10 +60,11 @@ jobs: path: v8go - name: Checkout XGen v1.0 + # ** XGEN will be renamed to DUI in the feature. and move to the new repository. ** + # ** new repository: https://github.com/YaoApp/dui.git ** uses: actions/checkout@v3 with: repository: yaoapp/xgen - # ref: 408470b84c9d6bb8ed988b545b6e46ffc2872014 path: xgen-v1.0 - name: Checkout Yao-Init @@ -131,34 +131,8 @@ jobs: clean: false - name: Archive production artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: yao-macos path: | dist/release/* - - # - name: Configure COS For Beijing - # env: - # SECRET_ID: ${{ secrets.COS_ID }} - # SECRET_KEY: ${{ secrets.COS_KEY }} - # BUCKET: release-bj-1252011659 - # REGION: ap-beijing - # run: | - # coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION - - # - name: Push To Beijing - # run: | - # for file in ./dist/release/*; do coscmd upload $file /archives/; done; - - # - name: Configure COS For Silicon Valley - # env: - # SECRET_ID: ${{ secrets.COS_ID }} - # SECRET_KEY: ${{ secrets.COS_KEY }} - # BUCKET: release-sv-1252011659 - # REGION: na-siliconvalley - # run: | - # coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION - - # - name: Push To Silicon Valley - # run: | - # for file in ./dist/release/*; do coscmd upload $file /archives/; done; diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 81035241..63bef684 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -52,8 +52,9 @@ env: # Application Setting ## Path - YAO_TEST_APPLICATION: ${{ github.WORKSPACE }}/../app YAO_EXTENSION_ROOT: ${{ github.WORKSPACE }}/../extension + YAO_TEST_APPLICATION: ${{ github.WORKSPACE }}/../app + YAO_SUI_TEST_APPLICATION: ${{ github.WORKSPACE }}/../yao-yao-startup-webapp YAO_TEST_BUILDER_APPLICATION: ${{ github.WORKSPACE }}/../page-builder-app ## Runtime @@ -122,7 +123,7 @@ jobs: }); - name: Setup Cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cache/go-build @@ -132,45 +133,52 @@ jobs: ${{ runner.os }}-go- - name: Checkout Kun - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: yaoapp/kun path: kun - name: Checkout Xun - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: yaoapp/xun path: xun - name: Checkout Gou - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: yaoapp/gou path: gou - name: Checkout V8Go - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: yaoapp/v8go lfs: true path: v8go - name: Checkout Demo App - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: yaoapp/yao-dev-app path: app + - name: Checkout Yao Startup Webapp + uses: actions/checkout@v4 + with: + repository: yaoapp/yao-startup-webapp + token: ${{ secrets.YAO_TEST_TOKEN }} + path: yao-startup-webapp + - name: Checkout Page Builder App - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: yaoapp/page-builder-app token: ${{ secrets.YAO_TEST_TOKEN }} path: page-builder-app - name: Checkout Extension - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: yaoapp/yao-extensions-dev path: extension @@ -184,11 +192,12 @@ jobs: mv app ../ mv extension ../ mv page-builder-app ../ + mv yao-startup-webapp ../ ls -l . ls -l ../ - name: Checkout pull request HEAD commit - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ env.HEAD }} diff --git a/.github/workflows/release-v0.10.3-pre-docker.yml b/.github/workflows/release-v0.10.3-pre-docker.yml deleted file mode 100644 index 2e7b1a97..00000000 --- a/.github/workflows/release-v0.10.3-pre-docker.yml +++ /dev/null @@ -1,86 +0,0 @@ -name: Release v0.10.3-pre Docker - -on: - # push: - # branches: [main] - # paths: - # - ".github/workflows/docker.yml" - workflow_run: - workflows: ["Release v0.10.3-pre Linux"] - types: - - completed - -env: - VERSION: 0.10.3 -jobs: - build: - if: ${{ github.event.workflow_run.conclusion == 'success' }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - ref: v0.10.3-pre - - - name: Get Version - run: | - echo VERSION=$(cat share/const.go |grep 'const VERSION' | awk '{print $4}' | sed "s/\"//g") >> $GITHUB_ENV - - - name: Check Version - run: echo $VERSION - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USER }} - password: ${{ secrets.DOCKER_TOKEN }} - - - name: Build Development - uses: docker/build-push-action@v2 - with: - context: ./docker/development - platforms: linux/amd64 - build-args: | - VERSION=${{ env.VERSION }} - ARCH=amd64 - push: true - tags: yaoapp/yao:${{ env.VERSION }}-amd64-dev - - - name: Build Development Arm64 - uses: docker/build-push-action@v2 - with: - context: ./docker/development - platforms: linux/arm64 - build-args: | - VERSION=${{ env.VERSION }} - ARCH=arm64 - push: true - tags: yaoapp/yao:${{ env.VERSION }}-arm64-dev - - - name: Build Production - uses: docker/build-push-action@v2 - with: - context: ./docker/production - platforms: linux/amd64 - build-args: | - VERSION=${{ env.VERSION }} - ARCH=amd64 - push: true - tags: yaoapp/yao:${{ env.VERSION }}-amd64 - - - name: Build Production Arm64 - uses: docker/build-push-action@v2 - with: - context: ./docker/production - platforms: linux/arm64 - build-args: | - VERSION=${{ env.VERSION }} - ARCH=arm64 - push: true - tags: yaoapp/yao:${{ env.VERSION }}-arm64 diff --git a/.github/workflows/release-v0.10.3-pre-linux.yml b/.github/workflows/release-v0.10.3-pre-linux.yml deleted file mode 100644 index 7ed14982..00000000 --- a/.github/workflows/release-v0.10.3-pre-linux.yml +++ /dev/null @@ -1,155 +0,0 @@ -name: Release v0.10.3-pre Linux - -on: - workflow_dispatch: - inputs: - tags: - description: "Version tags" - -jobs: - release: - strategy: - matrix: - go: [1.19.2] - runs-on: "ubuntu-20.04" - steps: - - name: Arm Build - run: | - sudo apt-get update - sudo apt-get install -y libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi libncurses5-dev build-essential bison flex libssl-dev bc - sudo apt-get install -y gcc-arm-linux-gnueabi g++-arm-linux-gnueabi - sudo apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf - sudo apt-get install -y g++-aarch64-linux-gnu crossbuild-essential-arm64 - - - name: Install coscmd - run: sudo pip3 install coscmd - - - name: Setup Node.js - uses: actions/setup-node@v3 - with: - node-version: 18 - - - name: Install pnpm - run: npm install -g pnpm - - - name: Setup Cache - uses: actions/cache@v3 - with: - path: | - ~/.cache/go-build - ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go- - - - name: Checkout Kun - uses: actions/checkout@v3 - with: - repository: yaoapp/kun - path: kun - - - name: Checkout Xun - uses: actions/checkout@v3 - with: - repository: yaoapp/xun - path: xun - - - name: Checkout Gou - uses: actions/checkout@v3 - with: - repository: yaoapp/gou - ref: dc3d98411f61e21cf775e4c82d92d5ac2acfc03c - path: gou - - - name: Checkout V8Go - uses: actions/checkout@v3 - with: - repository: rogchap/v8go - ref: 5e91d3d9dcabd2986f901b6b31590e49fc3c4dd8 - path: v8go - - - name: Download XGen v0.9 - uses: dsaltares/fetch-gh-release-asset@master - with: - repo: "yaoapp/xgen-deprecated" - version: "tags/v0.9.0" - file: "xgen-v0.9-dist.tar.gz" - - - name: Checkout XGen v1.0 - uses: actions/checkout@v3 - with: - repository: yaoapp/xgen - #ref: 408470b84c9d6bb8ed988b545b6e46ffc2872014 - path: xgen-v1.0 - - - name: Checkout Yao-Init - uses: actions/checkout@v3 - with: - repository: yaoapp/yao-init - ref: v0.10.3-pre - path: yao-init - - - 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 v0.9 ../xgen-v0.9 - mv xgen-v1.0 ../ - mv yao-init ../ - ls -l . - ls -l ../ - - - name: Checkout Code - uses: actions/checkout@v3 - with: - ref: v0.10.3-pre - - - name: Setup Go ${{ matrix.go }} - uses: actions/setup-go@v3 - with: - go-version: ${{ matrix.go }} - - - name: Setup Go Tools - run: | - make tools - - - name: Make Artifacts Linux - run: | - make artifacts-linux - - - name: Configure COS For Silicon Valley - env: - SECRET_ID: ${{ secrets.COS_ID }} - SECRET_KEY: ${{ secrets.COS_KEY }} - BUCKET: release-sv-1252011659 - REGION: na-siliconvalley - run: | - coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION - - - name: Push To Silicon Valley - run: | - for file in ./dist/release/*; do coscmd upload $file /archives/; done; - - - name: Archive production artifacts - uses: actions/upload-artifact@v3 - with: - name: yao-linux - path: | - dist/release/* - - # - name: Configure COS For Beijing - # env: - # SECRET_ID: ${{ secrets.COS_ID }} - # SECRET_KEY: ${{ secrets.COS_KEY }} - # BUCKET: release-bj-1252011659 - # REGION: ap-beijing - # run: | - # coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION - - # - name: Push To Beijing - # run: | - # for file in ./dist/release/*; do coscmd upload $file /archives/; done; diff --git a/.github/workflows/release-v0.10.3-pre-macos.yml b/.github/workflows/release-v0.10.3-pre-macos.yml deleted file mode 100644 index f3535c57..00000000 --- a/.github/workflows/release-v0.10.3-pre-macos.yml +++ /dev/null @@ -1,156 +0,0 @@ -name: Release v0.10.3-pre MacOS - -on: - workflow_dispatch: - inputs: - tags: - description: "Version tags" - push: - branches: [main] - paths: - - "share/const.go" - -jobs: - release: - strategy: - matrix: - go: [1.19.2] - runs-on: "macos-12" - steps: - - name: Install coscmd - run: | - sudo /Library/Frameworks/Python.framework/Versions/3.11/bin/python -m pip install --upgrade pip - sudo pip3 install coscmd - echo "/Library/Frameworks/Python.framework/Versions/3.11/bin" >> $GITHUB_PATH - - - name: Setup Node.js - uses: actions/setup-node@v3 - with: - node-version: 18 - - - name: Install pnpm - run: npm install -g pnpm - - - name: Setup Cache - uses: actions/cache@v3 - with: - path: | - ~/.cache/go-build - ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go- - - - name: Checkout Kun - uses: actions/checkout@v3 - with: - repository: yaoapp/kun - path: kun - - - name: Checkout Xun - uses: actions/checkout@v3 - with: - repository: yaoapp/xun - path: xun - - - name: Checkout Gou - uses: actions/checkout@v3 - with: - repository: yaoapp/gou - ref: dc3d98411f61e21cf775e4c82d92d5ac2acfc03c - path: gou - - - name: Checkout V8Go - uses: actions/checkout@v3 - with: - repository: rogchap/v8go - ref: 5e91d3d9dcabd2986f901b6b31590e49fc3c4dd8 - path: v8go - - - name: Download XGen v0.9 - uses: dsaltares/fetch-gh-release-asset@master - with: - repo: "yaoapp/xgen-deprecated" - version: "tags/v0.9.0" - file: "xgen-v0.9-dist.tar.gz" - - - name: Checkout XGen v1.0 - uses: actions/checkout@v3 - with: - repository: yaoapp/xgen - # ref: 408470b84c9d6bb8ed988b545b6e46ffc2872014 - path: xgen-v1.0 - - - name: Checkout Yao-Init - uses: actions/checkout@v3 - with: - repository: yaoapp/yao-init - ref: v0.10.3-pre - path: yao-init - - - 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 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@v3 - with: - ref: v0.10.3-pre - - - name: Setup Go ${{ matrix.go }} - uses: actions/setup-go@v3 - with: - go-version: ${{ matrix.go }} - - - name: Setup Go Tools - run: | - make tools - - - name: Make Artifacts MacOS - run: | - make artifacts-macos - - - name: Configure COS For Silicon Valley - env: - SECRET_ID: ${{ secrets.COS_ID }} - SECRET_KEY: ${{ secrets.COS_KEY }} - BUCKET: release-sv-1252011659 - REGION: na-siliconvalley - run: | - coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION - - - name: Push To Silicon Valley - run: | - for file in ./dist/release/*; do coscmd upload $file /archives/; done; - - - name: Archive production artifacts - uses: actions/upload-artifact@v3 - with: - name: yao-macos - path: | - dist/release/* - - # - name: Configure COS For Beijing - # env: - # SECRET_ID: ${{ secrets.COS_ID }} - # SECRET_KEY: ${{ secrets.COS_KEY }} - # BUCKET: release-bj-1252011659 - # REGION: ap-beijing - # run: | - # coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION - - # - name: Push To Beijing - # run: | - # for file in ./dist/release/*; do coscmd upload $file /archives/; done; diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 51261762..85eebcce 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -56,8 +56,9 @@ env: # Application Setting ## Path - YAO_TEST_APPLICATION: ${{ github.WORKSPACE }}/../app YAO_EXTENSION_ROOT: ${{ github.WORKSPACE }}/../extension + YAO_TEST_APPLICATION: ${{ github.WORKSPACE }}/../app + YAO_SUI_TEST_APPLICATION: ${{ github.WORKSPACE }}/../yao-yao-startup-webapp YAO_TEST_BUILDER_APPLICATION: ${{ github.WORKSPACE }}/../page-builder-app ## Runtime @@ -79,7 +80,7 @@ jobs: mongo: ["6.0"] steps: - name: Setup Cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cache/go-build @@ -89,45 +90,52 @@ jobs: ${{ runner.os }}-go- - name: Checkout Kun - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ env.REPO_KUN }} path: kun - name: Checkout Xun - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ env.REPO_XUN }} path: xun - name: Checkout Gou - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ env.REPO_GOU }} path: gou - name: Checkout V8Go - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: yaoapp/v8go lfs: true path: v8go - name: Checkout Demo App - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: yaoapp/yao-dev-app path: app + - name: Checkout Yao Startup Webapp + uses: actions/checkout@v4 + with: + repository: yaoapp/yao-startup-webapp + token: ${{ secrets.YAO_TEST_TOKEN }} + path: yao-startup-webapp + - name: Checkout Page Builder App - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: yaoapp/page-builder-app token: ${{ secrets.YAO_TEST_TOKEN }} path: page-builder-app - name: Checkout Extension - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: yaoapp/yao-extensions-dev path: extension @@ -141,11 +149,12 @@ jobs: mv app ../ mv extension ../ mv page-builder-app ../ + mv yao-startup-webapp ../ ls -l . ls -l ../ - name: Checkout Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Start Redis uses: supercharge/redis-github-action@1.4.0 diff --git a/.github/workflows/v0.10.3-release-docker.yml b/.github/workflows/v0.10.3-release-docker.yml deleted file mode 100644 index ac33f139..00000000 --- a/.github/workflows/v0.10.3-release-docker.yml +++ /dev/null @@ -1,84 +0,0 @@ -name: Release Yao v0.10.3 Docker Image - -on: - # push: - # branches: [main] - # paths: - # - ".github/workflows/docker.yml" - workflow_run: - workflows: ["Release Yao v0.10.3 Linux"] - types: - - completed - -env: - VERSION: 0.9.0 -jobs: - build: - if: ${{ github.event.workflow_run.conclusion == 'success' }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Get Version - run: | - echo VERSION=$(cat share/const.go |grep 'const VERSION' | awk '{print $4}' | sed "s/\"//g") >> $GITHUB_ENV - - - name: Check Version - run: echo $VERSION - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USER }} - password: ${{ secrets.DOCKER_TOKEN }} - - - name: Build Development - uses: docker/build-push-action@v2 - with: - context: ./docker/development - platforms: linux/amd64 - build-args: | - VERSION=${{ env.VERSION }} - ARCH=amd64 - push: true - tags: yaoapp/yao:${{ env.VERSION }}-amd64-dev - - - name: Build Development Arm64 - uses: docker/build-push-action@v2 - with: - context: ./docker/development - platforms: linux/arm64 - build-args: | - VERSION=${{ env.VERSION }} - ARCH=arm64 - push: true - tags: yaoapp/yao:${{ env.VERSION }}-arm64-dev - - - name: Build Production - uses: docker/build-push-action@v2 - with: - context: ./docker/production - platforms: linux/amd64 - build-args: | - VERSION=${{ env.VERSION }} - ARCH=amd64 - push: true - tags: yaoapp/yao:${{ env.VERSION }}-amd64 - - - name: Build Production Arm64 - uses: docker/build-push-action@v2 - with: - context: ./docker/production - platforms: linux/arm64 - build-args: | - VERSION=${{ env.VERSION }} - ARCH=arm64 - push: true - tags: yaoapp/yao:${{ env.VERSION }}-arm64 diff --git a/.github/workflows/v0.10.3-release-linux.yml b/.github/workflows/v0.10.3-release-linux.yml deleted file mode 100644 index 46b3f35d..00000000 --- a/.github/workflows/v0.10.3-release-linux.yml +++ /dev/null @@ -1,143 +0,0 @@ -name: Release Yao v0.10.3 Linux - -on: - workflow_dispatch: - inputs: - tags: - description: "Version tags" - -jobs: - build: - strategy: - matrix: - go: [1.19.2] - runs-on: "ubuntu-20.04" - steps: - - name: Arm Build - run: | - sudo apt-get update - sudo apt-get install -y libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi libncurses5-dev build-essential bison flex libssl-dev bc - sudo apt-get install -y gcc-arm-linux-gnueabi g++-arm-linux-gnueabi - sudo apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf - sudo apt-get install -y g++-aarch64-linux-gnu crossbuild-essential-arm64 - - - name: Install coscmd - run: sudo pip3 install coscmd - - - name: Setup Node.js - uses: actions/setup-node@v3 - with: - node-version: 18 - - - name: Install pnpm - run: npm install -g pnpm - - - name: Setup Cache - uses: actions/cache@v3 - with: - path: | - ~/.cache/go-build - ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go- - - - name: Checkout Kun - uses: actions/checkout@v3 - with: - repository: yaoapp/kun - path: kun - - - name: Checkout Xun - uses: actions/checkout@v3 - with: - repository: yaoapp/xun - path: xun - - - name: Checkout Gou - uses: actions/checkout@v3 - with: - repository: yaoapp/gou - path: gou - - - name: Checkout V8Go - uses: actions/checkout@v3 - with: - repository: yaoapp/v8go - path: v8go - - - name: Checkout XGen v1.0 - uses: actions/checkout@v3 - with: - repository: yaoapp/xgen - path: xgen-v1.0 - - - name: Checkout Yao-Init - uses: actions/checkout@v3 - with: - repository: yaoapp/yao-init - path: yao-init - - - name: Move Kun, Xun, Gou, UI, V8Go - run: | - mv kun ../ - mv xun ../ - mv gou ../ - mv v8go ../ - mv xgen-v1.0 ../ - mv yao-init ../ - ls -l . - ls -l ../ - - - name: Checkout Code - uses: actions/checkout@v3 - with: - ref: 9792f5f12245948e86b43091ede70b1be1c68f4a - - - name: Setup Go ${{ matrix.go }} - uses: actions/setup-go@v3 - with: - go-version: ${{ matrix.go }} - - - name: Setup Go Tools - run: | - make tools - - - name: Make Artifacts Linux - run: | - make artifacts-linux - mv dist/release/yao-0.10.3-dev-linux-arm64 dist/release/yao-0.10.3-linux-arm64 - mv dist/release/yao-0.10.3-dev-linux-amd64 dist/release/yao-0.10.3-linux-amd64 - - - name: Configure COS For Silicon Valley - env: - SECRET_ID: ${{ secrets.COS_ID }} - SECRET_KEY: ${{ secrets.COS_KEY }} - BUCKET: release-sv-1252011659 - REGION: na-siliconvalley - run: | - coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION - - - name: Push To Silicon Valley - run: | - for file in ./dist/release/*; do coscmd upload $file /archives/; done; - - - name: Archive production artifacts - uses: actions/upload-artifact@v3 - with: - name: yao-linux - path: | - dist/release/* - - # - name: Configure COS For Beijing - # env: - # SECRET_ID: ${{ secrets.COS_ID }} - # SECRET_KEY: ${{ secrets.COS_KEY }} - # BUCKET: release-bj-1252011659 - # REGION: ap-beijing - # run: | - # coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION - - # - name: Push To Beijing - # run: | - # for file in ./dist/release/*; do coscmd upload $file /archives/; done; diff --git a/.github/workflows/v0.10.3-release-macos.yml b/.github/workflows/v0.10.3-release-macos.yml deleted file mode 100644 index 31682198..00000000 --- a/.github/workflows/v0.10.3-release-macos.yml +++ /dev/null @@ -1,139 +0,0 @@ -name: Release Yao v0.10.3 MacOS - -on: - workflow_dispatch: - inputs: - tags: - description: "Version tags" -jobs: - build: - strategy: - matrix: - go: [1.19.2] - runs-on: "macos-12" - steps: - - name: Install coscmd - run: | - sudo /Library/Frameworks/Python.framework/Versions/3.11/bin/python -m pip install --upgrade pip - sudo pip3 install coscmd - echo "/Library/Frameworks/Python.framework/Versions/3.11/bin" >> $GITHUB_PATH - - - name: Setup Node.js - uses: actions/setup-node@v3 - with: - node-version: 18 - - - name: Install pnpm - run: npm install -g pnpm - - - name: Setup Cache - uses: actions/cache@v3 - with: - path: | - ~/.cache/go-build - ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go- - - - name: Checkout Kun - uses: actions/checkout@v3 - with: - repository: yaoapp/kun - path: kun - - - name: Checkout Xun - uses: actions/checkout@v3 - with: - repository: yaoapp/xun - path: xun - - - name: Checkout Gou - uses: actions/checkout@v3 - with: - repository: yaoapp/gou - path: gou - - - name: Checkout V8Go - uses: actions/checkout@v3 - with: - repository: yaoapp/v8go - path: v8go - - - name: Checkout XGen v1.0 - uses: actions/checkout@v3 - with: - repository: yaoapp/xgen - path: xgen-v1.0 - - - name: Checkout Yao-Init - uses: actions/checkout@v3 - with: - repository: yaoapp/yao-init - path: yao-init - - - name: Move Kun, Xun, Gou, UI, V8Go - run: | - mv kun ../ - mv xun ../ - mv gou ../ - mv v8go ../ - 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@v3 - with: - ref: 9792f5f12245948e86b43091ede70b1be1c68f4a - - - name: Setup Go ${{ matrix.go }} - uses: actions/setup-go@v3 - with: - go-version: ${{ matrix.go }} - - - name: Setup Go Tools - run: | - make tools - - - name: Make Artifacts MacOS - run: | - make artifacts-macos - mv dist/release/yao-0.10.3-dev-darwin-arm64 dist/release/yao-0.10.3-darwin-arm64 - mv dist/release/yao-0.10.3-dev-darwin-amd64 dist/release/yao-0.10.3-darwin-amd64 - - - name: Configure COS For Silicon Valley - env: - SECRET_ID: ${{ secrets.COS_ID }} - SECRET_KEY: ${{ secrets.COS_KEY }} - BUCKET: release-sv-1252011659 - REGION: na-siliconvalley - run: | - coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION - - - name: Push To Silicon Valley - run: | - for file in ./dist/release/*; do coscmd upload $file /archives/; done; - - - name: Archive production artifacts - uses: actions/upload-artifact@v3 - with: - name: yao-macos - path: | - dist/release/* - - # - name: Configure COS For Beijing - # env: - # SECRET_ID: ${{ secrets.COS_ID }} - # SECRET_KEY: ${{ secrets.COS_KEY }} - # BUCKET: release-bj-1252011659 - # REGION: ap-beijing - # run: | - # coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION - - # - name: Push To Beijing - # run: | - # for file in ./dist/release/*; do coscmd upload $file /archives/; done; diff --git a/Makefile b/Makefile index cb999979..42de08e8 100644 --- a/Makefile +++ b/Makefile @@ -156,12 +156,15 @@ artifacts-linux: clean # cd ../yao-init rm -rf README.md # Yao Builder - mkdir -p .tmp/data/builder - curl -o .tmp/yao-builder-latest.tar.gz https://release-sv.yaoapps.com/archives/yao-builder-latest.tar.gz - tar -zxvf .tmp/yao-builder-latest.tar.gz -C .tmp/data/builder - rm -rf .tmp/yao-builder-latest.tar.gz +# Remove Yao Builder - DUI PageBuilder component will provide online design for pure HTML pages or SUI pages in the future. +# mkdir -p .tmp/data/builder +# curl -o .tmp/yao-builder-latest.tar.gz https://release-sv.yaoapps.com/archives/yao-builder-latest.tar.gz +# tar -zxvf .tmp/yao-builder-latest.tar.gz -C .tmp/data/builder +# rm -rf .tmp/yao-builder-latest.tar.gz # Packing +# ** XGEN will be renamed to DUI in the feature. and move to the new repository. ** +# ** new repository: https://github.com/YaoApp/dui.git ** mkdir -p .tmp/data/xgen cp -r ./ui .tmp/data/ui cp -r ../xgen-v1.0/packages/setup/build .tmp/data/xgen/setup @@ -211,12 +214,15 @@ artifacts-macos: clean # cd ../yao-init && rm -rf README.md # Yao Builder - mkdir -p .tmp/data/builder - curl -o .tmp/yao-builder-latest.tar.gz https://release-sv.yaoapps.com/archives/yao-builder-latest.tar.gz - tar -zxvf .tmp/yao-builder-latest.tar.gz -C .tmp/data/builder - rm -rf .tmp/yao-builder-latest.tar.gz +# Remove Yao Builder - DUI PageBuilder component will provide online design for pure HTML pages or SUI pages in the future. +# mkdir -p .tmp/data/builder +# curl -o .tmp/yao-builder-latest.tar.gz https://release-sv.yaoapps.com/archives/yao-builder-latest.tar.gz +# tar -zxvf .tmp/yao-builder-latest.tar.gz -C .tmp/data/builder +# rm -rf .tmp/yao-builder-latest.tar.gz # Packing +# ** XGEN will be renamed to DUI in the feature. and move to the new repository. ** +# ** new repository: https://github.com/YaoApp/dui.git ** mkdir -p .tmp/data/xgen cp -r ./ui .tmp/data/ui cp -r ../xgen-v1.0/packages/setup/build .tmp/data/xgen/setup @@ -278,6 +284,8 @@ release: clean echo "XGEN v0.9" > .tmp/xgen/v0.9/dist/index.html # Building XGEN v1.0 +# ** XGEN will be renamed to DUI in the feature. and move to the new repository. ** +# ** new repository: https://github.com/YaoApp/dui.git ** export NODE_ENV=production git clone https://github.com/YaoApp/xgen.git .tmp/xgen/v1.0 # cd .tmp/xgen/v1.0 && git checkout 5002c3fded585aaa69a4366135b415ea3234964e @@ -296,10 +304,11 @@ release: clean rm -rf .tmp/yao-init/README.md # Yao Builder - mkdir -p .tmp/data/builder - curl -o .tmp/yao-builder-latest.tar.gz https://release-sv.yaoapps.com/archives/yao-builder-latest.tar.gz - tar -zxvf .tmp/yao-builder-latest.tar.gz -C .tmp/data/builder - rm -rf .tmp/yao-builder-latest.tar.gz +# Remove Yao Builder - DUI PageBuilder component will provide online design for pure HTML pages or SUI pages in the future. +# mkdir -p .tmp/data/builder +# curl -o .tmp/yao-builder-latest.tar.gz https://release-sv.yaoapps.com/archives/yao-builder-latest.tar.gz +# tar -zxvf .tmp/yao-builder-latest.tar.gz -C .tmp/data/builder +# rm -rf .tmp/yao-builder-latest.tar.gz # Packing mkdir -p .tmp/data/xgen @@ -338,6 +347,8 @@ linux-release: clean cp -r xgen/v0.9 .tmp/xgen/v0.9/dist # Building XGEN v1.0 +# ** XGEN will be renamed to DUI in the feature. and move to the new repository. ** +# ** new repository: https://github.com/YaoApp/dui.git ** export NODE_ENV=production git clone https://github.com/YaoApp/xgen.git .tmp/xgen/v1.0 rm -f .tmp/xgen/v1.0/pnpm-lock.yaml @@ -356,10 +367,11 @@ linux-release: clean rm -rf .tmp/yao-init/README.md # Yao Builder - mkdir -p .tmp/data/builder - curl -o .tmp/yao-builder-latest.tar.gz https://release-sv.yaoapps.com/archives/yao-builder-latest.tar.gz - tar -zxvf .tmp/yao-builder-latest.tar.gz -C .tmp/data/builder - rm -rf .tmp/yao-builder-latest.tar.gz +# Remove Yao Builder - DUI PageBuilder component will provide online design for pure HTML pages or SUI pages in the future. +# mkdir -p .tmp/data/builder +# curl -o .tmp/yao-builder-latest.tar.gz https://release-sv.yaoapps.com/archives/yao-builder-latest.tar.gz +# tar -zxvf .tmp/yao-builder-latest.tar.gz -C .tmp/data/builder +# rm -rf .tmp/yao-builder-latest.tar.gz # Packing mkdir -p .tmp/data/xgen