Skip to content

Commit 9b77f86

Browse files
GabriFedi97NiccoloFeimnencia
authored
ci: update extension catalogs output dir (#134)
Updates the pipeline to output extension image catalogs to the `artifacts/image-catalogs-extensions/` directory instead of writing them into the input `artifacts/image-catalogs/` directory. Renames the file prefix from `catalog-extensions-*` to `catalog-minimal-*` and fixes cosign signing to target the new output directory. Closes #133 --------- Signed-off-by: Gabriele Fedi <gabriele.fedi@enterprisedb.com> Signed-off-by: Niccolò Fei <niccolo.fei@enterprisedb.com> Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com> Co-authored-by: Niccolò Fei <niccolo.fei@enterprisedb.com> Co-authored-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
1 parent 7cef8e5 commit 9b77f86

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/update-catalogs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ jobs:
4444
version: ${{ env.DAGGER_VERSION }}
4545
verb: call
4646
module: ./dagger/maintenance/
47-
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/
4848

4949
- name: Install cosign
5050
uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3
5151

5252
- name: Sign catalogs
5353
run: |
54-
for file in artifacts/image-catalogs/*.yaml; do
54+
for file in artifacts/image-catalogs-extensions/*.yaml; do
5555
echo "Signing $file..."
5656
cosign sign-blob "$file" --bundle "$file.sigstore.json" --yes
5757
done
@@ -67,7 +67,7 @@ jobs:
6767
if: github.ref == 'refs/heads/main'
6868
with:
6969
cwd: 'artifacts'
70-
add: 'image-catalogs'
70+
add: 'image-catalogs-extensions'
7171
author_name: CloudNativePG Automated Updates
7272
author_email: noreply@cnpg.com
7373
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
@@ -106,7 +106,7 @@ func writeCatalogToDir(catalog *ImageCatalog, outDir *dagger.Directory) (*dagger
106106
return nil, err
107107
}
108108

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

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

0 commit comments

Comments
 (0)