Merge branch 'main' into fix-sidebar-label

go-gitea · Jun 19, 2023 · 35e10e6 · 35e10e6
2 parents 59581eb + 51c2aeb
commit 35e10e6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/files-changed.yml b/.github/workflows/files-changed.yml
@@ -4,24 +4,20 @@ 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:
-    name: detect which files changed
     runs-on: ubuntu-latest
     timeout-minutes: 3
     # Map a step output to a job output
@@ -31,6 +27,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
@@ -59,3 +56,7 @@ jobs:
             templates:
               - "templates/**/*.tmpl"
               - "poetry.lock"
+            docker:
+              - "Dockerfile"
+              - "Dockerfile.rootless"
+              - "docker/**"
diff --git 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'
+  regular:
+    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.actions == '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.outputs.actions == '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
diff --git a/Makefile b/Makefile
@@ -68,7 +68,7 @@ endif
 
 EXTRA_GOFLAGS ?=
 
-MAKE_VERSION := $(shell "$(MAKE)" -v | head -n 1)
+MAKE_VERSION := $(shell "$(MAKE)" -v | cat | head -n 1)
 MAKE_EVIDENCE_DIR := .make_evidence
 
 ifeq ($(RACE_ENABLED),true)