diff options
| author | Jakob Borg <jakob@kastelo.net> | 2024-05-27 13:56:32 +0200 |
|---|---|---|
| committer | Jakob Borg <jakob@kastelo.net> | 2024-05-27 13:56:32 +0200 |
| commit | 94181ade230f252e2f7a51cb7f4fd0c757c086da (patch) | |
| tree | c5e03b073b14f31e114542a8c8dd29b9f379cbc4 | |
| parent | e50933433e1e12cde5e15071768ab7a53eeed940 (diff) | |
build: Generalise S3 push options
| -rw-r--r-- | .github/workflows/build-syncthing.yaml | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/.github/workflows/build-syncthing.yaml b/.github/workflows/build-syncthing.yaml index 1fa99dc07d..268b38fb0e 100644 --- a/.github/workflows/build-syncthing.yaml +++ b/.github/workflows/build-syncthing.yaml @@ -642,19 +642,19 @@ jobs: cd packages "$GITHUB_WORKSPACE/tools/generate-release-json" "$BASE_URL" > nightly.json env: - BASE_URL: https://syncthing.ams3.digitaloceanspaces.com/nightly/ + BASE_URL: ${{ secrets.NIGHTLY_BASE_URL }} - name: Push artifacts uses: docker://docker.io/rclone/rclone:latest env: - RCLONE_CONFIG_SPACES_TYPE: s3 - RCLONE_CONFIG_SPACES_PROVIDER: DigitalOcean - RCLONE_CONFIG_SPACES_ACCESS_KEY_ID: ${{ secrets.SPACES_KEY }} - RCLONE_CONFIG_SPACES_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET }} - RCLONE_CONFIG_SPACES_ENDPOINT: ams3.digitaloceanspaces.com - RCLONE_CONFIG_SPACES_ACL: public-read + RCLONE_CONFIG_OBJSTORE_TYPE: s3 + RCLONE_CONFIG_OBJSTORE_PROVIDER: ${{ secrets.S3_PROVIDER }} + RCLONE_CONFIG_OBJSTORE_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} + RCLONE_CONFIG_OBJSTORE_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} + RCLONE_CONFIG_OBJSTORE_ENDPOINT: ${{ secrets.S3_ENDPOINT }} + RCLONE_CONFIG_OBJSTORE_ACL: public-read with: - args: sync packages spaces:syncthing/nightly + args: sync packages objstore:${{ secrets.S3_BUCKET }}/nightly # # Push release artifacts to Spaces @@ -696,29 +696,29 @@ jobs: version=$(go run build.go version) echo "VERSION=$version" >> $GITHUB_ENV - - name: Push to Spaces (${{ env.VERSION }}) + - name: Push to object store (${{ env.VERSION }}) uses: docker://docker.io/rclone/rclone:latest env: - RCLONE_CONFIG_SPACES_TYPE: s3 - RCLONE_CONFIG_SPACES_PROVIDER: DigitalOcean - RCLONE_CONFIG_SPACES_ACCESS_KEY_ID: ${{ secrets.SPACES_KEY }} - RCLONE_CONFIG_SPACES_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET }} - RCLONE_CONFIG_SPACES_ENDPOINT: ams3.digitaloceanspaces.com - RCLONE_CONFIG_SPACES_ACL: public-read + RCLONE_CONFIG_OBJSTORE_TYPE: s3 + RCLONE_CONFIG_OBJSTORE_PROVIDER: ${{ secrets.S3_PROVIDER }} + RCLONE_CONFIG_OBJSTORE_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} + RCLONE_CONFIG_OBJSTORE_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} + RCLONE_CONFIG_OBJSTORE_ENDPOINT: ${{ secrets.S3_ENDPOINT }} + RCLONE_CONFIG_OBJSTORE_ACL: public-read with: - args: sync packages spaces:syncthing/release/${{ env.VERSION }} + args: sync packages objstore:${{ secrets.S3_BUCKET }}/release/${{ env.VERSION }} - - name: Push to Spaces (latest) + - name: Push to object store (latest) uses: docker://docker.io/rclone/rclone:latest env: - RCLONE_CONFIG_SPACES_TYPE: s3 - RCLONE_CONFIG_SPACES_PROVIDER: DigitalOcean - RCLONE_CONFIG_SPACES_ACCESS_KEY_ID: ${{ secrets.SPACES_KEY }} - RCLONE_CONFIG_SPACES_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET }} - RCLONE_CONFIG_SPACES_ENDPOINT: ams3.digitaloceanspaces.com - RCLONE_CONFIG_SPACES_ACL: public-read - with: - args: sync spaces:syncthing/release/${{ env.VERSION }} spaces:syncthing/release/latest + RCLONE_CONFIG_OBJSTORE_TYPE: s3 + RCLONE_CONFIG_OBJSTORE_PROVIDER: ${{ secrets.S3_PROVIDER }} + RCLONE_CONFIG_OBJSTORE_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} + RCLONE_CONFIG_OBJSTORE_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} + RCLONE_CONFIG_OBJSTORE_ENDPOINT: ${{ secrets.S3_ENDPOINT }} + RCLONE_CONFIG_OBJSTORE_ACL: public-read + with: + args: sync objstore:${{ secrets.S3_BUCKET }}/release/${{ env.VERSION }} objstore:${{ secrets.S3_BUCKET }}/release/latest # # Build and push to Docker Hub |