diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 64f31ba..e6550c4 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -34,8 +34,8 @@ jobs: run: | cd sealdice-core # echo "PROJECT_VERSION=dev-${COMMIT_ID::7}" >> "$GITHUB_OUTPUT"; - echo "PROJECT_VERSION=1.4.5" >> "$GITHUB_OUTPUT"; - echo "PROJECT_VERSION_DISPLAY=v1.4.5 v20240410" >> "$GITHUB_OUTPUT"; + echo "PROJECT_VERSION=1.4.6" >> "$GITHUB_OUTPUT"; + echo "PROJECT_VERSION_DISPLAY=v1.4.6 v20240810" >> "$GITHUB_OUTPUT"; - name: Get current time uses: Kaven-Universe/github-action-current-date-time@v1 @@ -54,6 +54,7 @@ jobs: PROJECT_VERSION: ${{ steps.get-version.outputs.PROJECT_VERSION }} PROJECT_VERSION_DISPLAY: ${{ steps.get-version.outputs.PROJECT_VERSION_DISPLAY }} CUR_TIME: ${{ steps.currentTime.outputs.time }} + SEAL_TRUSTED_PRIVATE_KEY: ${{ secrets.SEAL_TRUSTED_PRIVATE_KEY }} resources-download: name: Download Related Resources @@ -80,13 +81,13 @@ jobs: - name: Download run: | mkdir lag - curl https://d1.sealdice.com/lagrange/0.0.3/Lagrange.OneBot_linux-arm64_7.0.zip?v=10 > lag/Lagrange.OneBot.linux-arm64.zip - curl https://d1.sealdice.com/lagrange/0.0.3/Lagrange.OneBot_linux-x64_7.0.zip?v=10 > lag/Lagrange.OneBot.linux-amd64.zip - curl https://d1.sealdice.com/lagrange/0.0.3/Lagrange.OneBot_win-x64_7.0.zip?v=10 > lag/Lagrange.OneBot.windows-amd64.zip - curl https://d1.sealdice.com/lagrange/0.0.3/Lagrange.OneBot_win-x86_7.0.zip?v=10 > lag/Lagrange.OneBot.windows-386.zip - curl https://d1.sealdice.com/lagrange/0.0.3/Lagrange.OneBot_osx-arm64_7.0.zip?v=10 > lag/Lagrange.OneBot.darwin-arm64.zip - curl https://d1.sealdice.com/lagrange/0.0.3/Lagrange.OneBot_osx-x64_7.0.zip?v=10 > lag/Lagrange.OneBot.darwin-amd64.zip - curl https://d1.sealdice.com/lagrange/0.0.3/Lagrange.OneBot_linux-musl-arm64_7.0.zip?v=10 > lag/Lagrange.OneBot.android-arm64.zip + curl https://d1.sealdice.com/lagrange/0.0.4/Lagrange.OneBot_linux-arm64_7.0.zip > lag/Lagrange.OneBot.linux-arm64.zip + curl https://d1.sealdice.com/lagrange/0.0.4/Lagrange.OneBot_linux-x64_7.0.zip > lag/Lagrange.OneBot.linux-amd64.zip + curl https://d1.sealdice.com/lagrange/0.0.4/Lagrange.OneBot_win-x64_7.0.zip > lag/Lagrange.OneBot.windows-amd64.zip + curl https://d1.sealdice.com/lagrange/0.0.4/Lagrange.OneBot_win-x86_7.0.zip > lag/Lagrange.OneBot.windows-386.zip + curl https://d1.sealdice.com/lagrange/0.0.4/Lagrange.OneBot_osx-arm64_7.0.zip > lag/Lagrange.OneBot.darwin-arm64.zip + curl https://d1.sealdice.com/lagrange/0.0.4/Lagrange.OneBot_osx-x64_7.0.zip > lag/Lagrange.OneBot.darwin-amd64.zip + curl https://d1.sealdice.com/lagrange/0.0.4/Lagrange.OneBot_linux-musl-arm64_7.0.zip > lag/Lagrange.OneBot.android-arm64.zip - name: Upload uses: actions/upload-artifact@v4 @@ -193,6 +194,7 @@ jobs: CUR_TIME: ${{needs.commit-num-check.outputs.CUR_TIME}} CORE_CID: ${{needs.commit-num-check.outputs.CORE_CID}} PROJECT_VERSION: ${{needs.commit-num-check.outputs.PROJECT_VERSION}} + SEAL_TRUSTED_PRIVATE_KEY: ${{ secrets.SEAL_TRUSTED_PRIVATE_KEY }} strategy: matrix: # target: linux/amd64, linux/arm64, windows/386, windows/amd64 @@ -280,7 +282,16 @@ jobs: CGO_ENABLED: ${{ matrix.goos == 'windows' && 1 || 0 }} # 为了规避glibc兼容问题,linux上不使用cgo CGO_FLAGS: -Werror=unused-variable -Werror=implicit-function-declaration -O2 -H=windowsgui working-directory: ./sealdice-core - run: go build -o "output/$BINARY_NAME" -trimpath -ldflags "-s -w -X sealdice-core/dice.VERSION_PRERELEASE= -X sealdice-core/dice.VERSION_BUILD_METADATA=+20240410 -X sealdice-core/dice.APP_CHANNEL=stable" . + run: go build -o "output/$BINARY_NAME" -trimpath -ldflags "-s -w -X sealdice-core/dice.VERSION_PRERELEASE= -X sealdice-core/dice.VERSION_BUILD_METADATA=+20240810 -X sealdice-core/dice.APP_CHANNEL=stable -X 'sealdice-core/dice.DefaultSignUrl=${NT_SIGN_URL}' -X 'sealdice-core/dice.SealTrustedClientPrivateKey=${SEAL_TRUSTED_PRIVATE_KEY}'" . + + - name: Run UPX + uses: crazy-max/ghaction-upx@v3 + if: matrix.musl == '' + with: + version: latest + files: ./sealdice-core/output/${{ env.BINARY_NAME }} + args: -9 -fq + - name: Upload Core uses: actions/upload-artifact@v4 with: @@ -297,6 +308,7 @@ jobs: CORE_CID: ${{needs.commit-num-check.outputs.CORE_CID}} PROJECT_VERSION: ${{needs.commit-num-check.outputs.PROJECT_VERSION}} CUR_TIME: ${{needs.commit-num-check.outputs.CUR_TIME}} + SEAL_TRUSTED_PRIVATE_KEY: ${{ secrets.SEAL_TRUSTED_PRIVATE_KEY }} strategy: matrix: # target: darwin/amd64 darwin/arm64 @@ -348,7 +360,7 @@ jobs: CGO_ENABLED: 1 CGO_FLAGS: -Werror=unused-variable -Werror=implicit-function-declaration -O2 working-directory: ./sealdice-core - run: go build -o "output/sealdice-core" -trimpath -ldflags "-s -w -X sealdice-core/dice.VERSION_PRERELEASE= -X sealdice-core/dice.VERSION_BUILD_METADATA=+20240410 -X sealdice-core/dice.APP_CHANNEL=stable" . + run: go build -o "output/sealdice-core" -trimpath -ldflags "-s -w -X sealdice-core/dice.VERSION_PRERELEASE= -X sealdice-core/dice.VERSION_BUILD_METADATA=+20240810 -X sealdice-core/dice.APP_CHANNEL=stable -X 'sealdice-core/dice.DefaultSignUrl=${NT_SIGN_URL}' -X 'sealdice-core/dice.SealTrustedClientPrivateKey=${SEAL_TRUSTED_PRIVATE_KEY}'" . - name: Upload Core uses: actions/upload-artifact@v4 @@ -366,6 +378,7 @@ jobs: CORE_CID: ${{needs.commit-num-check.outputs.CORE_CID}} PROJECT_VERSION: ${{needs.commit-num-check.outputs.PROJECT_VERSION}} CUR_TIME: ${{needs.commit-num-check.outputs.CUR_TIME}} + SEAL_TRUSTED_PRIVATE_KEY: ${{ secrets.SEAL_TRUSTED_PRIVATE_KEY }} steps: # - name: Cache dist get # id: cache-core-dist @@ -419,7 +432,7 @@ jobs: CC: ${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android33-clang CGO_FLAGS: -Werror=unused-variable -Werror=implicit-function-declaration -O2 working-directory: ./sealdice-core - run: go build -o "output/sealdice-core" -trimpath -ldflags "-s -w -X sealdice-core/dice.VERSION_PRERELEASE= -X sealdice-core/dice.VERSION_BUILD_METADATA=+20240410 -X sealdice-core/dice.APP_CHANNEL=stable" . + run: go build -o "output/sealdice-core" -trimpath -ldflags "-s -w -X sealdice-core/dice.VERSION_PRERELEASE= -X sealdice-core/dice.VERSION_BUILD_METADATA=+20240810 -X sealdice-core/dice.APP_CHANNEL=stable -X 'sealdice-core/dice.DefaultSignUrl=${NT_SIGN_URL}' -X 'sealdice-core/dice.SealTrustedClientPrivateKey=${SEAL_TRUSTED_PRIVATE_KEY}'" . - name: Upload Core uses: actions/upload-artifact@v4 with: diff --git a/readme.md b/readme.md index 5d9934b..23b4408 100644 --- a/readme.md +++ b/readme.md @@ -37,4 +37,4 @@ dependabot 的配置在 [dependabot.yml](.github/dependabot.yml),自动批准 ## 关于 issue 和 pull request -你可以通过 fork 本项目并提交 pull request 的形式贡献代码 \ No newline at end of file +你可以通过 fork 本项目并提交 pull request 的形式贡献代码 diff --git a/sealdice-android b/sealdice-android index b277625..c532f32 160000 --- a/sealdice-android +++ b/sealdice-android @@ -1 +1 @@ -Subproject commit b277625449a6b5fa595746fe15d244df1aa8091b +Subproject commit c532f327353bd7919d6f102ae9a9ff0a10cde519 diff --git a/sealdice-builtins b/sealdice-builtins index cbfc3d3..6c298ee 160000 --- a/sealdice-builtins +++ b/sealdice-builtins @@ -1 +1 @@ -Subproject commit cbfc3d368225ded84cd39ffe1ec54563b5c785ba +Subproject commit 6c298ee2d61e6759564681af1670a7f990f218b0 diff --git a/sealdice-core b/sealdice-core index c5498a4..597d857 160000 --- a/sealdice-core +++ b/sealdice-core @@ -1 +1 @@ -Subproject commit c5498a487dec114a83f3a4870e4c166194df6970 +Subproject commit 597d857c32d8a258501c69f67af7631f2c68e348 diff --git a/sealdice-ui b/sealdice-ui index 64d1448..e3a53af 160000 --- a/sealdice-ui +++ b/sealdice-ui @@ -1 +1 @@ -Subproject commit 64d144832d7e0b6d1f53bad993511e6866f82587 +Subproject commit e3a53af5ba8b9702e705040db5a3abc387f31888 diff --git a/update-submodules.sh b/update-submodules.sh index c7ae0f6..1345dc1 100755 --- a/update-submodules.sh +++ b/update-submodules.sh @@ -4,5 +4,4 @@ git submodule update cd sealdice-builtins && git pull origin master && cd .. cd sealdice-ui && git pull origin master && cd .. cd sealdice-android && git pull origin master && cd .. -cd go-cqhttp && git pull origin master && cd .. cd sealdice-core && git pull origin master && cd ..