Skip to content

Commit

Permalink
chore: action update
Browse files Browse the repository at this point in the history
  • Loading branch information
xinshangshangxin committed Mar 27, 2024
1 parent a3ce692 commit f175fc6
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 61 deletions.
18 changes: 7 additions & 11 deletions .github/workflows/release-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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

Expand All @@ -66,19 +67,14 @@ jobs:
run: pnpm run build
working-directory: ${{ github.workspace }}/siyuan-note/siyuan/app

- name: Remove Build Directory
uses: JesseTG/[email protected]
with:
path: ${{ github.workspace }}/siyuan-note/siyuan/app/build

- name: gomobile
working-directory: ${{ github.workspace }}/go
run: |
go install golang.org/x/mobile/cmd/gomobile@latest
gomobile init
- name: Set up java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "17"
Expand Down Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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 }}
Expand Down
16 changes: 6 additions & 10 deletions .github/workflows/release-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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

Expand All @@ -58,11 +59,6 @@ jobs:
run: pnpm run build
working-directory: ${{ github.workspace }}/siyuan-note/siyuan/app

- name: Remove Build Directory
uses: JesseTG/[email protected]
with:
path: ${{ github.workspace }}/siyuan-note/siyuan/app/build

- name: gomobile
working-directory: ${{ github.workspace }}/go
run: |
Expand Down Expand Up @@ -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:
Expand Down
36 changes: 6 additions & 30 deletions .github/workflows/release-pc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Expand All @@ -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

Expand All @@ -106,31 +107,6 @@ jobs:
run: pnpm run build
working-directory: ${{ github.workspace }}/siyuan-note/siyuan/app

- name: Remove Build Directory
uses: JesseTG/[email protected]
with:
path: ${{ github.workspace }}/siyuan-note/siyuan/app/build

- name: Remove Kernel Directory for Linux
uses: JesseTG/[email protected]
with:
path: ${{ github.workspace }}/siyuan-note/siyuan/app/kernel-linux

- name: Remove Kernel Directory for Windows
uses: JesseTG/[email protected]
with:
path: ${{ github.workspace }}/siyuan-note/siyuan/app/kernel

- name: Remove Kernel Directory for macOS
uses: JesseTG/[email protected]
with:
path: ${{ github.workspace }}/siyuan-note/siyuan/app/kernel-darwin

- name: Remove Kernel Directory for macOS ARM64
uses: JesseTG/[email protected]
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')
Expand Down Expand Up @@ -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:
Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` 文件(未签名)安装

## 没有最新版吗?

Expand All @@ -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编码

Expand All @@ -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)

0 comments on commit f175fc6

Please sign in to comment.