From b3bbc505ea0576fd6a5a12f5a49fda4fdcfc0cd0 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 18 Jun 2023 03:14:59 +0200 Subject: [PATCH 1/8] Only run docker-dryrun when necessary --- .github/workflows/files-changed.yml | 12 +++++++----- .github/workflows/pull-docker-dryrun.yml | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.github/workflows/files-changed.yml b/.github/workflows/files-changed.yml index f0c34df86d36..2216a27f3767 100644 --- a/.github/workflows/files-changed.yml +++ b/.github/workflows/files-changed.yml @@ -4,20 +4,17 @@ on: workflow_call: outputs: backend: - description: "whether backend files changed" value: ${{ jobs.detect.outputs.backend }} frontend: - description: "whether frontend files changed" value: ${{ jobs.detect.outputs.frontend }} docs: - description: "whether docs files changed" value: ${{ jobs.detect.outputs.docs }} actions: - description: "whether actions files changed" value: ${{ jobs.detect.outputs.actions }} templates: - description: "whether templates files changed" value: ${{ jobs.detect.outputs.templates }} + docker: + value: ${{ jobs.detect.outputs.docker }} jobs: detect: @@ -31,6 +28,7 @@ jobs: docs: ${{ steps.changes.outputs.docs }} actions: ${{ steps.changes.outputs.actions }} templates: ${{ steps.changes.outputs.templates }} + docker: ${{ steps.changes.outputs.docker }} steps: - uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 @@ -58,3 +56,7 @@ jobs: templates: - "templates/**/*.tmpl" + + docker: + - "Dockerfile" + - "Dockerfile.rootless" diff --git a/.github/workflows/pull-docker-dryrun.yml b/.github/workflows/pull-docker-dryrun.yml index 916de6b27d35..7763902d1c10 100644 --- a/.github/workflows/pull-docker-dryrun.yml +++ b/.github/workflows/pull-docker-dryrun.yml @@ -11,8 +11,8 @@ jobs: files-changed: uses: ./.github/workflows/files-changed.yml - docker-dryrun: - if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.frontend == 'true' || needs.files-changed.outputs.actions == 'true' + rootful: + if: needs.files-changed.outputs.docker == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -21,3 +21,15 @@ jobs: with: push: false tags: gitea/gitea:linux-amd64 + + rootless: + if: needs.files-changed.outputs.docker == 'true' + needs: files-changed + runs-on: ubuntu-latest + steps: + - uses: docker/setup-buildx-action@v2 + - uses: docker/build-push-action@v4 + with: + push: false + file: Dockerfile.rootless + tags: gitea/gitea:linux-amd64 From 79f530dfd10291a124d748c3cc8e41b0ec3bc966 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 18 Jun 2023 03:17:17 +0200 Subject: [PATCH 2/8] change to trigger actions --- Dockerfile | 2 +- Dockerfile.rootless | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 06481cdf5aac..fa757bdb47fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -#Build stage +#Build stage! FROM docker.io/library/golang:1.20-alpine3.18 AS build-env ARG GOPROXY diff --git a/Dockerfile.rootless b/Dockerfile.rootless index aa74d3598750..f46c340a3b0f 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,4 +1,4 @@ -#Build stage +#Build stage! FROM docker.io/library/golang:1.20-alpine3.18 AS build-env ARG GOPROXY From 8007847d37ec17db9939a1f4f0c93632abef1ef4 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 18 Jun 2023 03:22:38 +0200 Subject: [PATCH 3/8] Revert "change to trigger actions" This reverts commit 79f530dfd10291a124d748c3cc8e41b0ec3bc966. --- Dockerfile | 2 +- Dockerfile.rootless | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fa757bdb47fc..06481cdf5aac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -#Build stage! +#Build stage FROM docker.io/library/golang:1.20-alpine3.18 AS build-env ARG GOPROXY diff --git a/Dockerfile.rootless b/Dockerfile.rootless index f46c340a3b0f..aa74d3598750 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,4 +1,4 @@ -#Build stage! +#Build stage FROM docker.io/library/golang:1.20-alpine3.18 AS build-env ARG GOPROXY From be72fac8d3f8a2c388721ca47750dc3b99de10dd Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 18 Jun 2023 03:22:49 +0200 Subject: [PATCH 4/8] re-add actions condition --- .github/workflows/pull-docker-dryrun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-docker-dryrun.yml b/.github/workflows/pull-docker-dryrun.yml index 7763902d1c10..ca2691ba6440 100644 --- a/.github/workflows/pull-docker-dryrun.yml +++ b/.github/workflows/pull-docker-dryrun.yml @@ -23,7 +23,7 @@ jobs: tags: gitea/gitea:linux-amd64 rootless: - if: needs.files-changed.outputs.docker == 'true' + if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest steps: From 8627adfbd265e7ce4518df6227082c686c0c9f12 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 18 Jun 2023 03:23:25 +0200 Subject: [PATCH 5/8] re-add actions condition --- .github/workflows/pull-docker-dryrun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-docker-dryrun.yml b/.github/workflows/pull-docker-dryrun.yml index ca2691ba6440..58fa06c5aeba 100644 --- a/.github/workflows/pull-docker-dryrun.yml +++ b/.github/workflows/pull-docker-dryrun.yml @@ -12,7 +12,7 @@ jobs: uses: ./.github/workflows/files-changed.yml rootful: - if: needs.files-changed.outputs.docker == 'true' + if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest steps: From 3e330a4dbe0bb71cd08f4bc89da8eed81917b6c3 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 18 Jun 2023 03:35:14 +0200 Subject: [PATCH 6/8] add docker directory --- .github/workflows/files-changed.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/files-changed.yml b/.github/workflows/files-changed.yml index 2216a27f3767..2519c0e73fcc 100644 --- a/.github/workflows/files-changed.yml +++ b/.github/workflows/files-changed.yml @@ -60,3 +60,4 @@ jobs: docker: - "Dockerfile" - "Dockerfile.rootless" + - "docker/**" From eb3c3b50b9201652797fe84c4d1269b1a563f55b Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 18 Jun 2023 09:36:50 +0200 Subject: [PATCH 7/8] Update .github/workflows/pull-docker-dryrun.yml --- .github/workflows/pull-docker-dryrun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-docker-dryrun.yml b/.github/workflows/pull-docker-dryrun.yml index 58fa06c5aeba..61f1fd5632e1 100644 --- a/.github/workflows/pull-docker-dryrun.yml +++ b/.github/workflows/pull-docker-dryrun.yml @@ -11,7 +11,7 @@ jobs: files-changed: uses: ./.github/workflows/files-changed.yml - rootful: + regular: if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest From cc6784a027a7b617e16f139c937ee76f72065143 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 18 Jun 2023 12:23:41 +0200 Subject: [PATCH 8/8] shorten detect step name --- .github/workflows/files-changed.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/files-changed.yml b/.github/workflows/files-changed.yml index 2519c0e73fcc..bab296b41317 100644 --- a/.github/workflows/files-changed.yml +++ b/.github/workflows/files-changed.yml @@ -18,7 +18,6 @@ on: jobs: detect: - name: detect which files changed runs-on: ubuntu-latest timeout-minutes: 3 # Map a step output to a job output