From 33149ebee97253c829d88c8d9bc46059a7b89c35 Mon Sep 17 00:00:00 2001 From: Ncam Gnrvngu Date: Wed, 28 May 2025 22:53:42 +0200 Subject: [PATCH 1/6] add pull request workflow --- .forgejo/workflows/image.yaml | 2 +- .forgejo/workflows/pr.yaml | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .forgejo/workflows/pr.yaml diff --git a/.forgejo/workflows/image.yaml b/.forgejo/workflows/image.yaml index 99c2535..960b348 100644 --- a/.forgejo/workflows/image.yaml +++ b/.forgejo/workflows/image.yaml @@ -13,4 +13,4 @@ jobs: image: gcr.io/kaniko-project/executor:debug steps: - run: 'echo { \"auths\": { \"git.ncamgnrvngu.eu\": { \"auth\": \"$(echo -n ncamgnrvngu:${{ secrets.DOCKER_TOKEN }} | base64)\" } } } > /kaniko/.docker/config.json' - - run: '/kaniko/executor --context "git://${{ github.token }}@git.ncamgnrvngu.eu/NcamGnrvngu/website.git#refs/heads/master" --dockerfile "Dockerfile" --destination "git.ncamgnrvngu.eu/ncamgnrvngu/website:latest"' + - run: '/kaniko/executor --context "git://${{ github.token }}@git.ncamgnrvngu.eu/NcamGnrvngu/website.git#{{ github.ref }}" --dockerfile "Dockerfile" --destination "git.ncamgnrvngu.eu/ncamgnrvngu/website:latest"' diff --git a/.forgejo/workflows/pr.yaml b/.forgejo/workflows/pr.yaml new file mode 100644 index 0000000..05114fb --- /dev/null +++ b/.forgejo/workflows/pr.yaml @@ -0,0 +1,16 @@ +on: [push, pull_request] +jobs: + build: + runs-on: docker + container: + image: gcr.io/kaniko-project/executor:debug + steps: + - run: 'echo { \"auths\": { \"git.ncamgnrvngu.eu\": { \"auth\": \"$(echo -n ncamgnrvngu:${{ secrets.DOCKER_TOKEN }} | base64)\" } } } > /kaniko/.docker/config.json' + - run: '/kaniko/executor --context "git://${{ github.token }}@git.ncamgnrvngu.eu/NcamGnrvngu/website.git#{{ github.ref }}" --dockerfile "Dockerfile" --destination "git.ncamgnrvngu.eu/ncamgnrvngu/website:latest"' + reuse-compliance: + runs-on: docker + container: + image: fsfe/reuse:latest + steps: + - uses: actions/checkout@v4 + - run: "reuse lint" From 9fccd77abec2e2e428f1f380a524714835f2928d Mon Sep 17 00:00:00 2001 From: Ncam Gnrvngu Date: Wed, 28 May 2025 22:56:21 +0200 Subject: [PATCH 2/6] fix --- .forgejo/workflows/image.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.forgejo/workflows/image.yaml b/.forgejo/workflows/image.yaml index 960b348..2544dcc 100644 --- a/.forgejo/workflows/image.yaml +++ b/.forgejo/workflows/image.yaml @@ -12,5 +12,4 @@ jobs: container: image: gcr.io/kaniko-project/executor:debug steps: - - run: 'echo { \"auths\": { \"git.ncamgnrvngu.eu\": { \"auth\": \"$(echo -n ncamgnrvngu:${{ secrets.DOCKER_TOKEN }} | base64)\" } } } > /kaniko/.docker/config.json' - - run: '/kaniko/executor --context "git://${{ github.token }}@git.ncamgnrvngu.eu/NcamGnrvngu/website.git#{{ github.ref }}" --dockerfile "Dockerfile" --destination "git.ncamgnrvngu.eu/ncamgnrvngu/website:latest"' + - run: '/kaniko/executor --context "git://${{ github.token }}@git.ncamgnrvngu.eu/NcamGnrvngu/website.git#${{ github.ref }}" --dockerfile "Dockerfile" --no-push' From 3c9fa89d7f34b24a47a0b4bd8f52c8a7f1917fd8 Mon Sep 17 00:00:00 2001 From: Ncam Gnrvngu Date: Wed, 28 May 2025 22:58:05 +0200 Subject: [PATCH 3/6] fix --- .forgejo/workflows/pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/pr.yaml b/.forgejo/workflows/pr.yaml index 05114fb..4daa763 100644 --- a/.forgejo/workflows/pr.yaml +++ b/.forgejo/workflows/pr.yaml @@ -6,7 +6,7 @@ jobs: image: gcr.io/kaniko-project/executor:debug steps: - run: 'echo { \"auths\": { \"git.ncamgnrvngu.eu\": { \"auth\": \"$(echo -n ncamgnrvngu:${{ secrets.DOCKER_TOKEN }} | base64)\" } } } > /kaniko/.docker/config.json' - - run: '/kaniko/executor --context "git://${{ github.token }}@git.ncamgnrvngu.eu/NcamGnrvngu/website.git#{{ github.ref }}" --dockerfile "Dockerfile" --destination "git.ncamgnrvngu.eu/ncamgnrvngu/website:latest"' + - run: '/kaniko/executor --context "git://${{ github.token }}@git.ncamgnrvngu.eu/NcamGnrvngu/website.git#${{ github.ref }}" --dockerfile "Dockerfile" --destination "git.ncamgnrvngu.eu/ncamgnrvngu/website:latest"' reuse-compliance: runs-on: docker container: From d819b61e253a7330ccfca0b6d5155b987bcbf151 Mon Sep 17 00:00:00 2001 From: Ncam Gnrvngu Date: Wed, 28 May 2025 23:03:07 +0200 Subject: [PATCH 4/6] fix --- .forgejo/workflows/image.yaml | 1 + .forgejo/workflows/pr.yaml | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/image.yaml b/.forgejo/workflows/image.yaml index 2544dcc..cb6d199 100644 --- a/.forgejo/workflows/image.yaml +++ b/.forgejo/workflows/image.yaml @@ -12,4 +12,5 @@ jobs: container: image: gcr.io/kaniko-project/executor:debug steps: + - run: 'echo { \"auths\": { \"git.ncamgnrvngu.eu\": { \"auth\": \"$(echo -n ncamgnrvngu:${{ secrets.DOCKER_TOKEN }} | base64)\" } } } > /kaniko/.docker/config.json' - run: '/kaniko/executor --context "git://${{ github.token }}@git.ncamgnrvngu.eu/NcamGnrvngu/website.git#${{ github.ref }}" --dockerfile "Dockerfile" --no-push' diff --git a/.forgejo/workflows/pr.yaml b/.forgejo/workflows/pr.yaml index 4daa763..1b12882 100644 --- a/.forgejo/workflows/pr.yaml +++ b/.forgejo/workflows/pr.yaml @@ -5,12 +5,9 @@ jobs: container: image: gcr.io/kaniko-project/executor:debug steps: - - run: 'echo { \"auths\": { \"git.ncamgnrvngu.eu\": { \"auth\": \"$(echo -n ncamgnrvngu:${{ secrets.DOCKER_TOKEN }} | base64)\" } } } > /kaniko/.docker/config.json' - - run: '/kaniko/executor --context "git://${{ github.token }}@git.ncamgnrvngu.eu/NcamGnrvngu/website.git#${{ github.ref }}" --dockerfile "Dockerfile" --destination "git.ncamgnrvngu.eu/ncamgnrvngu/website:latest"' + - run: '/kaniko/executor --context "git://${{ github.token }}@git.ncamgnrvngu.eu/NcamGnrvngu/website.git#${{ github.ref }}" --dockerfile "Dockerfile" --no-push' reuse-compliance: runs-on: docker - container: - image: fsfe/reuse:latest steps: - uses: actions/checkout@v4 - - run: "reuse lint" + - uses: https://github.com/fsfe/reuse-action@v5 From 922a1bc4fdadf3a58efed8a8e928802e15208a30 Mon Sep 17 00:00:00 2001 From: Ncam Gnrvngu Date: Wed, 28 May 2025 23:04:58 +0200 Subject: [PATCH 5/6] fix --- .forgejo/workflows/image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/image.yaml b/.forgejo/workflows/image.yaml index cb6d199..3d4c569 100644 --- a/.forgejo/workflows/image.yaml +++ b/.forgejo/workflows/image.yaml @@ -13,4 +13,4 @@ jobs: image: gcr.io/kaniko-project/executor:debug steps: - run: 'echo { \"auths\": { \"git.ncamgnrvngu.eu\": { \"auth\": \"$(echo -n ncamgnrvngu:${{ secrets.DOCKER_TOKEN }} | base64)\" } } } > /kaniko/.docker/config.json' - - run: '/kaniko/executor --context "git://${{ github.token }}@git.ncamgnrvngu.eu/NcamGnrvngu/website.git#${{ github.ref }}" --dockerfile "Dockerfile" --no-push' + - run: '/kaniko/executor --context "git://${{ github.token }}@git.ncamgnrvngu.eu/NcamGnrvngu/website.git#${{ github.ref }}" --dockerfile "Dockerfile" --destination "git.ncamgnrvngu.eu/ncamgnrvngu/website:latest" From d8110da1ca8f78c106ed3fe7ed74e9adaba59a34 Mon Sep 17 00:00:00 2001 From: Ncam Gnrvngu Date: Wed, 28 May 2025 23:05:48 +0200 Subject: [PATCH 6/6] make project REUSE compliant --- .forgejo/workflows/pr.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.forgejo/workflows/pr.yaml b/.forgejo/workflows/pr.yaml index 1b12882..a468c07 100644 --- a/.forgejo/workflows/pr.yaml +++ b/.forgejo/workflows/pr.yaml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2025 Ncam Gnrvngu +# +# SPDX-License-Identifier: AGPL-3.0-or-later + on: [push, pull_request] jobs: build: