diff --git a/.github/workflows/build-homarr.yml b/.github/workflows/build-homarr.yml index 5b4cdac..6ad48ce 100644 --- a/.github/workflows/build-homarr.yml +++ b/.github/workflows/build-homarr.yml @@ -42,3 +42,4 @@ jobs: architecture: ${{matrix.architectures}} branch_name: ${{github.event.pull_request.base.ref}} is_merged: ${{github.event.pull_request.merged}} + secrets: inherit diff --git a/.github/workflows/build-tester.yml b/.github/workflows/build-tester.yml index 86c845a..b3d4033 100644 --- a/.github/workflows/build-tester.yml +++ b/.github/workflows/build-tester.yml @@ -30,3 +30,4 @@ jobs: architecture: ${{matrix.architectures}} branch_name: dev is_merged: false + secrets: inherit diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 5e1844d..d459fa9 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -30,6 +30,15 @@ on: is_merged: required: true type: boolean + secrets: + HOMELAB_LXC_EP: + required: true + HOMELAB_LXC_TOKEN: + required: true + RCLONE_CONFIG: + required: true + RCLONE_CONFIG_PASS: + required: true jobs: image-build: @@ -61,13 +70,7 @@ jobs: if: github.event_name == 'schedule' || (inputs.branch_name == 'main' && inputs.is_merged == true) run: | cat << EOF > /tmp/rclone.conf - [cloudflare] - type = s3 - provider = Cloudflare - access_key_id = $R2_ACCESS_KEY_ID - secret_access_key = $R2_SECRET_ACCESS_KEY - endpoint = $R2_ENDPOINT - region = auto + $RCLONE_CONFIG EOF echo rclone copy ./${{inputs.app_name}}-${{inputs.app_version}}-${{inputs.architecture}}-root.tar.xz cloudflare:lxc-images --config /tmp/rclone.conf @@ -75,9 +78,8 @@ jobs: echo echo 'LXC Image published successfully !' env: - R2_ACCESS_KEY_ID: ${{secrets.R2_ACCESS_KEY_ID}} - R2_SECRET_ACCESS_KEY: ${{secrets.R2_SECRET_ACCESS_KEY}} - R2_ENDPOINT: ${{secrets.R2_ENDPOINT}} + RCLONE_CONFIG: ${{secrets.RCLONE_CONFIG}} + RCLONE_CONFIG_PASS: ${{secrets.RCLONE_CONFIG_PASS}} - name: Publish build info if: github.event_name == 'schedule' || (inputs.branch_name == 'main' && inputs.is_merged == true)