diff --git a/.github/workflows/release-ota.yml b/.github/workflows/release-ota.yml index f36badc230..97afbe85e8 100644 --- a/.github/workflows/release-ota.yml +++ b/.github/workflows/release-ota.yml @@ -10,10 +10,12 @@ on: description: Number of releases to fetch from MaaAssistantArknights, 2 at least required: false default: 31 + type: number limit_2: description: Number of releases to fetch from MaaRelease required: false default: 30 + type: number env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -104,7 +106,7 @@ jobs: file_glob: true file: build-ota/*.zip tag: ${{ needs.create-tag.outputs.release_tag }} - prerelease: ${{ env.prerelease }} + prerelease: ${{ needs.create-tag.outputs.prerelease }} overwrite: true make-ota-mac: @@ -131,30 +133,16 @@ jobs: echo ${{ secrets.SPARKLE_PRIV_KEY }} | ./bin/generate_appcast --ed-key-file - ./packages fi - - name: Install Rclone - run: brew install rclone - - name: Upload Appcast Packages - env: - RCLONE_CONFIG_MAA_TYPE: s3 - RCLONE_CONFIG_MAA_PROVIDER: Cloudflare - RCLONE_CONFIG_MAA_ACCESS_KEY_ID: ${{ secrets.R2_KEY_ID }} - RCLONE_CONFIG_MAA_SECRET_ACCESS_KEY: ${{ secrets.R2_ACCESS_KEY }} - RCLONE_CONFIG_MAA_ENDPOINT: ${{ secrets.R2_ENDPOINT }} - run: | - rclone sync ./packages MAA:maa-release/macos - rclone delete MAA:maa-release/macos --min-age 90d - - # TODO: 这里实际上传的都是完整包,而不是 OTA 包,待修复 - # - name: Upload to MaaRelease - # uses: svenstaro/upload-release-action@v2 - # with: - # repo_name: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }} - # repo_token: ${{ secrets.MAARELEASE_RELEASE }} - # file_glob: true - # file: packages/*.dmg - # tag: ${{ needs.create-tag.outputs.release_tag }} - # prerelease: ${{ env.prerelease }} - # overwrite: true + - name: Upload to MaaRelease + uses: svenstaro/upload-release-action@v2 + with: + repo_name: ${{ format('{0}/{1}', github.repository_owner, 'MaaRelease') }} + repo_token: ${{ secrets.MAARELEASE_RELEASE }} + file_glob: true + file: packages/* + tag: ${{ needs.create-tag.outputs.release_tag }} + prerelease: ${{ needs.create-tag.outputs.prerelease }} + overwrite: true release: needs: