ci(release): upload to B2 with conveyor

This commit is contained in:
Gauthier Roebroeck 2023-12-20 10:38:03 +08:00
parent eb244704ba
commit cccbc39c9d
3 changed files with 28 additions and 15 deletions

View file

@ -170,8 +170,8 @@ jobs:
mkdir ./secret mkdir ./secret
echo $APPLE_PRIVATE_KEY | base64 --decode > ./secret/apple_private_key.p8 echo $APPLE_PRIVATE_KEY | base64 --decode > ./secret/apple_private_key.p8
- name: Conveyor make site - name: Conveyor make copied-site
uses: hydraulic-software/conveyor/actions/build@v12.1 uses: hydraulic-software/conveyor/actions/build@v13.0
if: inputs.github_release if: inputs.github_release
with: with:
command: --cache-limit=2.0 -f conveyor.ci.conf make site -o ./output/site command: --cache-limit=2.0 -f conveyor.ci.conf make site -o ./output/site
@ -180,6 +180,10 @@ jobs:
env: env:
APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }} APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }} APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
AWS_S3_BUCKET: ${{ secrets.B2_BUCKET }}
AWS_S3_ENDPOINT: 'https://s3.us-east-005.backblazeb2.com'
AWS_ACCESS_KEY_ID: ${{ secrets.B2_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.B2_SECRET_ACCESS_KEY }}
- name: Upload Conveyor log - name: Upload Conveyor log
if: always() && inputs.github_release if: always() && inputs.github_release
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -188,7 +192,7 @@ jobs:
path: ~/.cache/hydraulic/conveyor/logs/log.latest.txt path: ~/.cache/hydraulic/conveyor/logs/log.latest.txt
- name: Conveyor make old-site - name: Conveyor make old-site
uses: hydraulic-software/conveyor/actions/build@v12.1 uses: hydraulic-software/conveyor/actions/build@v13.0
if: inputs.github_release if: inputs.github_release
with: with:
command: --cache-limit=2.0 -f conveyor.ci.conf make old-site -o ./output/old-site command: --cache-limit=2.0 -f conveyor.ci.conf make old-site -o ./output/old-site
@ -197,6 +201,10 @@ jobs:
env: env:
APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }} APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }} APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
AWS_S3_BUCKET: ${{ secrets.B2_BUCKET }}
AWS_S3_ENDPOINT: 'https://s3.us-east-005.backblazeb2.com'
AWS_ACCESS_KEY_ID: ${{ secrets.B2_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.B2_SECRET_ACCESS_KEY }}
- name: Upload Conveyor log - name: Upload Conveyor log
if: always() && inputs.github_release if: always() && inputs.github_release
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -210,16 +218,6 @@ jobs:
rm ./output/old-site/download.html rm ./output/old-site/download.html
rm ./output/old-site/icon.svg rm ./output/old-site/icon.svg
- name: Upload Conveyor site to B2
if: inputs.github_release
uses: jakejarvis/s3-sync-action@master
env:
AWS_S3_BUCKET: ${{ secrets.B2_BUCKET }}
AWS_S3_ENDPOINT: 'https://s3.us-east-005.backblazeb2.com'
AWS_ACCESS_KEY_ID: ${{ secrets.B2_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.B2_SECRET_ACCESS_KEY }}
SOURCE_DIR: 'output/site'
- name: JReleaser Release - name: JReleaser Release
if: inputs.github_release if: inputs.github_release
uses: gradle/gradle-build-action@v2 uses: gradle/gradle-build-action@v2
@ -273,7 +271,7 @@ jobs:
build/jreleaser/output.properties build/jreleaser/output.properties
- name: Conveyor - publish to Microsoft Store - name: Conveyor - publish to Microsoft Store
uses: hydraulic-software/conveyor/actions/build@v12.1 uses: hydraulic-software/conveyor/actions/build@v13.0
if: inputs.msstore_release if: inputs.msstore_release
with: with:
command: --cache-limit=2.0 -f conveyor.msstore.ci.conf make ms-store-release -o ./output/msstore command: --cache-limit=2.0 -f conveyor.msstore.ci.conf make ms-store-release -o ./output/msstore
@ -283,6 +281,10 @@ jobs:
CONVEYOR_MSSTORE_CLIENT_ID: ${{ secrets.CONVEYOR_MSSTORE_CLIENT_ID }} CONVEYOR_MSSTORE_CLIENT_ID: ${{ secrets.CONVEYOR_MSSTORE_CLIENT_ID }}
CONVEYOR_MSSTORE_CLIENT_SECRET: ${{ secrets.CONVEYOR_MSSTORE_CLIENT_SECRET }} CONVEYOR_MSSTORE_CLIENT_SECRET: ${{ secrets.CONVEYOR_MSSTORE_CLIENT_SECRET }}
CONVEYOR_MSSTORE_TENANT_ID: ${{ secrets.CONVEYOR_MSSTORE_TENANT_ID }} CONVEYOR_MSSTORE_TENANT_ID: ${{ secrets.CONVEYOR_MSSTORE_TENANT_ID }}
AWS_S3_BUCKET: ${{ secrets.B2_BUCKET }}
AWS_S3_ENDPOINT: 'https://s3.us-east-005.backblazeb2.com'
AWS_ACCESS_KEY_ID: ${{ secrets.B2_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.B2_SECRET_ACCESS_KEY }}
- name: Upload Conveyor log - name: Upload Conveyor log
if: always() && inputs.msstore_release if: always() && inputs.msstore_release
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4

View file

@ -9,4 +9,15 @@ app {
# the secret is written to file by CI from Github Secrets # the secret is written to file by CI from Github Secrets
private-key = ./secret/apple_private_key.p8 private-key = ./secret/apple_private_key.p8
} }
site {
copy-to = "s3:"${env.AWS_S3_BUCKET}/
s3 {
# Still required by Conveyor even though endpoint is set
region = "unused"
access-key-id = ${env.AWS_ACCESS_KEY_ID}
secret-access-key = ${env.AWS_SECRET_ACCESS_KEY}
endpoint = ${env.AWS_S3_ENDPOINT}
}
}
} }

View file

@ -59,4 +59,4 @@ app {
} }
} }
conveyor.compatibility-level = 11 conveyor.compatibility-level = 13