Skip to content

Commit 484bd1f

Browse files
authored
Merge branch 'main' into dev/10152
2 parents 634d2fc + 9b77f86 commit 484bd1f

3 files changed

Lines changed: 18 additions & 5 deletions

File tree

.github/workflows/update-catalogs.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ defaults:
1616

1717
jobs:
1818
update-catalogs:
19+
name: Updating catalogs
1920
runs-on: ubuntu-24.04
21+
permissions:
22+
id-token: write
2023
steps:
2124
- name: Checkout
2225
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -41,7 +44,17 @@ jobs:
4144
version: ${{ env.DAGGER_VERSION }}
4245
verb: call
4346
module: ./dagger/maintenance/
44-
args: generate-catalogs --catalogs-dir artifacts/image-catalogs/ export --path artifacts/image-catalogs/
47+
args: generate-catalogs --catalogs-dir artifacts/image-catalogs/ export --path artifacts/image-catalogs-extensions/
48+
49+
- name: Install cosign
50+
uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3
51+
52+
- name: Sign catalogs
53+
run: |
54+
for file in artifacts/image-catalogs-extensions/*.yaml; do
55+
echo "Signing $file..."
56+
cosign sign-blob "$file" --bundle "$file.sigstore.json" --yes
57+
done
4558
4659
- name: Diff
4760
working-directory: artifacts
@@ -54,7 +67,7 @@ jobs:
5467
if: github.ref == 'refs/heads/main'
5568
with:
5669
cwd: 'artifacts'
57-
add: 'image-catalogs'
70+
add: 'image-catalogs-extensions'
5871
author_name: CloudNativePG Automated Updates
5972
author_email: noreply@cnpg.com
6073
message: 'chore: update extensions imageCatalogs'

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ list of compatible extension images for PostgreSQL 18+ versions.
176176

177177
- **Frequency:** Built once a week.
178178
- **Location:** Published in the [`artifacts`
179-
project](https://github.com/cloudnative-pg/artifacts/tree/main/image-catalogs).
179+
project](https://github.com/cloudnative-pg/artifacts/tree/main/image-catalogs-extensions).
180180
- **Naming Convention:** These are based on the `minimal` catalog and use the
181-
`catalog-extensions` prefix (e.g., `catalog-extensions-trixie.yaml`).
181+
`catalog-minimal` prefix (e.g., `catalog-minimal-trixie.yaml`).
182182

dagger/maintenance/catalogs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func writeCatalogToDir(catalog *ImageCatalog, outDir *dagger.Directory) (*dagger
107107
return nil, err
108108
}
109109

110-
outName := fmt.Sprintf("catalog-extensions-%s.yaml", catalog.Metadata.Labels[LabelImageOS])
110+
outName := fmt.Sprintf("catalog-minimal-%s.yaml", catalog.Metadata.Labels[LabelImageOS])
111111

112112
return outDir.WithNewFile(outName, buf.String()), nil
113113
}

0 commit comments

Comments
 (0)