From 84c4bee60db0cdc085236c570d75b1619716d4d6 Mon Sep 17 00:00:00 2001 From: Frederic Leger Date: Tue, 14 Jan 2025 12:16:31 +0100 Subject: [PATCH] ci: fix github actions errors Signed-off-by: Frederic Leger --- .github/workflows/main-ci.yml | 2 +- .github/workflows/pull-request-ci.yml | 6 +++--- .github/workflows/release.yml | 2 +- Makefile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index c0a5b3d..a84502e 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -9,7 +9,7 @@ jobs: name: Continuous Integration uses: ./.github/workflows/__shared-ci.yml secrets: - oci-registry-password: ${{ secrets.GHCR_PAT_TOKEN }} + oci-registry-password: ${{ secrets.GITHUB_TOKEN }} get-available-images-matrix: uses: ./.github/workflows/__shared-get-available-images-matrix.yml diff --git a/.github/workflows/pull-request-ci.yml b/.github/workflows/pull-request-ci.yml index fb6ac2d..6afb3f1 100644 --- a/.github/workflows/pull-request-ci.yml +++ b/.github/workflows/pull-request-ci.yml @@ -9,7 +9,7 @@ jobs: name: Continuous Integration uses: ./.github/workflows/__shared-ci.yml secrets: - oci-registry-password: ${{ secrets.GHCR_PAT_TOKEN }} + oci-registry-password: ${{ secrets.GITHUB_TOKEN }} update-pr: if: ${{ needs.ci.outputs.built-images }} @@ -38,13 +38,13 @@ jobs: const commentMessage = Object.values(builtImages).map(({name,images}) => { const imagesToPull = images.map(image => `\`\`\`\ndocker pull ${image}\n\`\`\``).join("\n"); - + return `### ${name}\n${imagesToPull}`; }).join("\n"); if(commentMessage.length){ core.setOutput( - 'comment-body', + 'comment-body', commentMessage + "\n\nOnce the Pull Request gets validated, these(s) image(s) will automatically be deleted." ); } else { diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b5fac6c..22ae6ef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -91,4 +91,4 @@ jobs: oci-registry: ${{ vars.OCI_REGISTRY }} images: ${{ needs.get-images-to-build.outputs.images }} secrets: - oci-registry-password: ${{ secrets.GHCR_PAT_TOKEN }} + oci-registry-password: ${{ secrets.GITHUB_TOKEN }} diff --git a/Makefile b/Makefile index af3e352..b08b7b0 100644 --- a/Makefile +++ b/Makefile @@ -21,4 +21,4 @@ lint: ## Execute linting (https://github.com/github/super-linter) # Argument fix workaround ############################# %: - @: \ No newline at end of file + @: