From f175fc6fca5005d6555743428373c0c942b9b1e9 Mon Sep 17 00:00:00 2001 From: feng Date: Wed, 27 Mar 2024 14:17:51 +0800 Subject: [PATCH] chore: action update --- .github/workflows/release-android.yml | 18 ++++++-------- .github/workflows/release-docker.yml | 10 ++++---- .github/workflows/release-ios.yml | 16 +++++------- .github/workflows/release-pc.yml | 36 +++++---------------------- README.md | 9 +++---- 5 files changed, 28 insertions(+), 61 deletions(-) diff --git a/.github/workflows/release-android.yml b/.github/workflows/release-android.yml index 5e80181..d84fb78 100644 --- a/.github/workflows/release-android.yml +++ b/.github/workflows/release-android.yml @@ -17,9 +17,9 @@ jobs: kernel_path: "../../../siyuan-android/app/libs/kernel.aar" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: - path: ${{ github.workspace }}/siyuan-note/ + path: siyuan-note - name: clone origin and apply patches run: | @@ -45,12 +45,13 @@ jobs: mkdir -p app/libs/ - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: "1.22" + cache-dependency-path: "**/*.sum" - name: Set up Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 18 @@ -66,11 +67,6 @@ jobs: run: pnpm run build working-directory: ${{ github.workspace }}/siyuan-note/siyuan/app - - name: Remove Build Directory - uses: JesseTG/rm@v1.0.2 - with: - path: ${{ github.workspace }}/siyuan-note/siyuan/app/build - - name: gomobile working-directory: ${{ github.workspace }}/go run: | @@ -78,7 +74,7 @@ jobs: gomobile init - name: Set up java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: "temurin" java-version: "17" @@ -122,7 +118,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload Android - uses: actions/upload-release-asset@v1 + uses: shogo82148/actions-upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml index a924bbf..7036114 100644 --- a/.github/workflows/release-docker.yml +++ b/.github/workflows/release-docker.yml @@ -33,9 +33,9 @@ jobs: docker-images: true swap-storage: true - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: - path: ${{ github.workspace }}/siyuan-note/ + path: siyuan-note - name: clone origin and apply patches run: | @@ -51,13 +51,13 @@ jobs: git status - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Setup Docker buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Log in to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USER }} password: ${{ secrets.DOCKER_HUB_PWD }} diff --git a/.github/workflows/release-ios.yml b/.github/workflows/release-ios.yml index b519b74..91d7d9c 100644 --- a/.github/workflows/release-ios.yml +++ b/.github/workflows/release-ios.yml @@ -18,9 +18,9 @@ jobs: target: "ios" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: - path: ${{ github.workspace }}/siyuan-note/ + path: siyuan-note - name: clone origin and apply patches run: | @@ -37,12 +37,13 @@ jobs: git clone --depth=1 https://github.com/siyuan-note/siyuan-ios.git - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: "1.22" + cache-dependency-path: "**/*.sum" - name: Set up Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 18 @@ -58,11 +59,6 @@ jobs: run: pnpm run build working-directory: ${{ github.workspace }}/siyuan-note/siyuan/app - - name: Remove Build Directory - uses: JesseTG/rm@v1.0.2 - with: - path: ${{ github.workspace }}/siyuan-note/siyuan/app/build - - name: gomobile working-directory: ${{ github.workspace }}/go run: | @@ -101,7 +97,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload Android - uses: actions/upload-release-asset@v1 + uses: shogo82148/actions-upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/.github/workflows/release-pc.yml b/.github/workflows/release-pc.yml index db2fdea..a0e39e7 100644 --- a/.github/workflows/release-pc.yml +++ b/.github/workflows/release-pc.yml @@ -45,9 +45,9 @@ jobs: suffix: "win.exe" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: - path: ${{ github.workspace }}/siyuan-note/ + path: siyuan-note - name: clone origin and apply patches run: | @@ -74,9 +74,10 @@ jobs: working-directory: ${{ github.workspace }} - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: "1.22" + cache-dependency-path: "**/*.sum" - name: Set up goversioninfo run: go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo && go install github.com/josephspurrier/goversioninfo/cmd/goversioninfo @@ -90,7 +91,7 @@ jobs: GOARCH: ${{ matrix.config.goarch }} - name: Set up Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 18 @@ -106,31 +107,6 @@ jobs: run: pnpm run build working-directory: ${{ github.workspace }}/siyuan-note/siyuan/app - - name: Remove Build Directory - uses: JesseTG/rm@v1.0.2 - with: - path: ${{ github.workspace }}/siyuan-note/siyuan/app/build - - - name: Remove Kernel Directory for Linux - uses: JesseTG/rm@v1.0.2 - with: - path: ${{ github.workspace }}/siyuan-note/siyuan/app/kernel-linux - - - name: Remove Kernel Directory for Windows - uses: JesseTG/rm@v1.0.2 - with: - path: ${{ github.workspace }}/siyuan-note/siyuan/app/kernel - - - name: Remove Kernel Directory for macOS - uses: JesseTG/rm@v1.0.2 - with: - path: ${{ github.workspace }}/siyuan-note/siyuan/app/kernel-darwin - - - name: Remove Kernel Directory for macOS ARM64 - uses: JesseTG/rm@v1.0.2 - with: - path: ${{ github.workspace }}/siyuan-note/siyuan/app/kernel-darwin-arm64 - - name: Generate Icon Resource and Properties/Version Info For Windows run: ${{ github.workspace }}\go\${{ matrix.config.gobin }}\goversioninfo -platform-specific=true -icon="resource\icon.ico" -manifest="resource\goversioninfo.exe.manifest" if: contains( matrix.config.goos, 'windows') @@ -158,7 +134,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload Electron App - uses: actions/upload-release-asset@v1 + uses: shogo82148/actions-upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/README.md b/README.md index af79c45..0a21737 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,9 @@ ## 没有 ios 应用吗? -**没有**, 因为需要花钱, 不花钱的只能使用7天, 所以就不提供了 +**没有**, 因为需要花钱, 不花钱的只能使用7天, 所以就不提供了 -如果手机支持 [巨魔TrollStore](https://github.com/opa334/TrollStore), 可以在 [Release](https://github.com/demoshang/siyuan-patch/releases) 下载 `ipa` 文件安装 +如果手机支持 [巨魔TrollStore](https://github.com/opa334/TrollStore), 可以在 [Release](https://github.com/demoshang/siyuan-patch/releases) 下载 `ipa` 文件(未签名)安装 ## 没有最新版吗? @@ -31,7 +31,7 @@ - 按照文章[生成上传密钥和密钥库](https://developer.android.com/studio/publish/app-signing?hl=zh-cn#generate-key) > 注意秘钥(Key)的 `Alias` 设置成 `debug` - ![](https://user-images.githubusercontent.com/26966709/275674510-3fe33b8f-5aa0-4eb0-bbb6-bfdd22c1fab2.png) + ![generate-key](https://user-images.githubusercontent.com/26966709/275674510-3fe33b8f-5aa0-4eb0-bbb6-bfdd22c1fab2.png) - 秘钥转成base64编码 @@ -50,5 +50,4 @@ - `DOCKER_HUB_PWD` 刚才保存的token 5. 按如下操作点击, 等待10分钟左右进入 Release 页面查看 - -![image](https://github.com/demoshang/siyuan-patch/assets/26966709/d139ff11-b4a8-46ff-a532-394fddf27c54) + ![release-cron](https://github.com/demoshang/siyuan-patch/assets/26966709/d139ff11-b4a8-46ff-a532-394fddf27c54)