Skip to content

Commit 85d3bb5

Browse files
committed
Updates
1 parent 6a43941 commit 85d3bb5

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.github/workflows/build-iso.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
build-iso:
6060
name: Build ISO
6161
needs: [set-env]
62-
uses: AlmaLinux/atomic-ci/.github/workflows/build-iso.yml@v5
62+
uses: AlmaLinux/atomic-ci/.github/workflows/build-iso.yml@v6
6363
with:
6464
image-name: "${{ needs.set-env.outputs.IMAGE_NAME }}"
6565
image: "${{ needs.set-env.outputs.IMAGE_REF }}:${{ needs.set-env.outputs.LATEST_TAG }}"
@@ -70,9 +70,9 @@ jobs:
7070
REGISTRY: ${{ needs.set-env.outputs.REGISTRY }}
7171
REGISTRY_USER: ${{ needs.set-env.outputs.REGISTRY_USER }}
7272
upload-to-cloudflare: false
73+
# bucket: ${{ secrets.R2_BUCKET }}
7374
secrets:
7475
REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7576
# R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
76-
# R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
77-
# R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
78-
# R2_BUCKET: ${{ secrets.R2_BUCKET }}
77+
# ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
78+
# SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
6565
build-image:
6666
name: Build image
67-
uses: AlmaLinux/atomic-ci/.github/workflows/build-image.yml@v5
67+
uses: AlmaLinux/atomic-ci/.github/workflows/build-image.yml@v6
6868
needs: set-env
6969
with:
7070
containerfile: Dockerfile
@@ -115,7 +115,7 @@ jobs:
115115
name: Promote image
116116
needs: [set-env, build-image, test-image]
117117
if: ${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
118-
uses: AlmaLinux/atomic-ci/.github/workflows/retag-image.yml@v5
118+
uses: AlmaLinux/atomic-ci/.github/workflows/retag-image.yml@v6
119119
with:
120120
image: ${{ needs.build-image.outputs.image-ref }}@${{ needs.build-image.outputs.digest }}
121121
tag: |
@@ -133,7 +133,7 @@ jobs:
133133
name: Create Release
134134
needs: [set-env, build-image, test-image, promote-image]
135135
if: ${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
136-
uses: AlmaLinux/atomic-ci/.github/workflows/create-release.yml@v5
136+
uses: AlmaLinux/atomic-ci/.github/workflows/create-release.yml@v6
137137
with:
138138
image-name: "${{ needs.set-env.outputs.IMAGE_NAME }}"
139139
version: ${{ needs.build-image.outputs.version }}

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ Follow these steps:
6161
2. **Create an API token** with "Object Read & Write" permissions, limited to your new bucket. Save the Access Key ID and Secret Access Key.
6262
3. **Add the following repository secrets in GitHub:**
6363
- `R2_ACCOUNT_ID`: Your Cloudflare account ID (found in the dashboard URL: `https://dash.cloudflare.com/<R2_ACCOUNT_ID>/home`)
64-
- `R2_ACCESS_KEY_ID`: The Access Key ID from your API token
65-
- `R2_SECRET_ACCESS_KEY`: The Secret Access Key from your API token
66-
- `R2_BUCKET`: Your bucket name
64+
- `ACCESS_KEY_ID`: The Access Key ID from your API token
65+
- `SECRET_ACCESS_KEY`: The Secret Access Key from your API token
66+
- `BUCKET`: Your bucket name
6767
4. **Update your workflow:**
6868
In the `build-iso` job of [`build-iso.yml`](/.github/workflows/build-iso.yml), uncomment the secret definitions for these secrets and set `upload-to-cloudflare: true` in the workflow inputs:
6969
```yaml

atomic-desktop.pub

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
-----BEGIN PUBLIC KEY-----
2-
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEwF4Hh1ycFLbSzYr6LH1DR65U2Iad
3-
vKSMPxnora3gkPxYg3WpAUOWC58AW6U6qaFWsSgXF2Qq3VE+7455BvYhbg==
2+
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEqdVEERP3rl6YPIIsYYZb26DmHt3L
3+
Mz6/eRZpb/KP8p4vsLjGELs7H81z4DpkKH0y7CLYpHihXXvzWjSWWRwQgA==
44
-----END PUBLIC KEY-----

0 commit comments

Comments
 (0)