Skip to content

Commit c43ab4f

Browse files
committed
ci: fix generate release config
1 parent 969ed1d commit c43ab4f

File tree

6 files changed

+27
-6
lines changed

6 files changed

+27
-6
lines changed

.github/release-config.template.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ include-paths:
99
- images/{{image}}/*
1010
- .github/actions/should-build-image/*
1111
- .github/workflows/__shared-ci.yml
12-
- .github/workflows/__shared-get-available-images-matrix.yml
12+
- .github/workflows/__shared-get-available-images-matrix.yml

.github/workflows/__shared-ci.yml

+9
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ on:
1111
description: "Password or GitHub token (packages:read and packages:write scopes) used to log against the OCI registry."
1212
required: true
1313

14+
permissions:
15+
contents: read
16+
issues: read
17+
packages: write
18+
pull-requests: read
19+
statuses: write
20+
# FIXME: This is a workaround for having workflow actions. See https://github.com/orgs/community/discussions/38659
21+
id-token: write
22+
1423
jobs:
1524
checks:
1625
# FIXME: the new version of the linter fails with a lot of errors if upgraded

.github/workflows/generate-release-config.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
3333
- uses: actions/upload-artifact@v4
3434
with:
35-
name: changed-files
35+
name: changed-files-${{ matrix.image }}
3636
path: ./.github/release-config/${{ matrix.image }}-release-config.yml
3737

3838
publish-actions-readme:
@@ -48,7 +48,8 @@ jobs:
4848

4949
- uses: actions/download-artifact@v4
5050
with:
51-
name: changed-files
51+
pattern: changed-files-*
52+
merge-multiple: true
5253
path: ./.github/release-config/
5354

5455
- uses: tibdex/github-app-token@v1

.github/workflows/pull-request-ci.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@ on:
44
pull_request:
55
branches: [main]
66

7+
# jscpd:ignore-start
8+
permissions:
9+
contents: read
10+
issues: read
11+
packages: write
12+
pull-requests: read
13+
statuses: write
14+
# FIXME: This is a workaround for having workflow actions. See https://github.com/orgs/community/discussions/38659
15+
id-token: write
16+
# jscpd:ignore-end
17+
718
jobs:
819
ci:
920
name: Continuous Integration
@@ -51,7 +62,7 @@ jobs:
5162
core.setOutput('comment-body','No images have been built.');
5263
}
5364
54-
- uses: hoverkraft-tech/ci-github-common/actions/create-or-update-comment@0.4.3
65+
- uses: hoverkraft-tech/ci-github-common/actions/create-or-update-comment@0.15.0
5566
with:
5667
title: "Images have been built :sparkles: !"
5768
body: |

images/ci-helm/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG version=v3.12.0
22
FROM quay.io/helmpack/chart-testing:${version}
33

4-
LABEL org.opencontainers.image.source = "https://github.com/hoverkraft-tech/docker-base-images"
4+
LABEL org.opencontainers.image.source="https://github.com/hoverkraft-tech/docker-base-images"
55

66
# we can probably ignore warning about versions of such packages
77
# hadolint ignore=DL3018

images/mydumper/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:jammy
22

3-
LABEL org.opencontainers.image.source = "https://github.com/hoverkraft-tech/docker-base-images"
3+
LABEL org.opencontainers.image.source="https://github.com/hoverkraft-tech/docker-base-images"
44

55
ENV DEBIAN_FRONTEND=noninteractive \
66
TZ=UTC \

0 commit comments

Comments
 (0)