Merge remote-tracking branch 'upstream/release/v1.15' into release/dc…

…s/v1.15
unfoldingWord · Feb 3, 2022 · 8ff4bd6 · 8ff4bd6
2 parents dc5f448 + a93d5e1
commit 8ff4bd6
Showing 1 changed file with 136 additions and 4 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -779,6 +779,69 @@ depends_on:
 trigger:
   ref:
   - refs/heads/main
+  event:
+    exclude:
+    - cron
+
+steps:
+  - name: fetch-tags
+    image: docker:git
+    commands:
+      - git fetch --tags --force
+
+  - name: publish
+    pull: always
+    image: techknowlogick/drone-docker:latest
+    settings:
+      auto_tag: false
+      tags: dev-linux-amd64
+      repo: gitea/gitea
+      build_args:
+        - GOPROXY=off
+      password:
+        from_secret: docker_password
+      username:
+        from_secret: docker_username
+    when:
+      event:
+        exclude:
+        - pull_request
+
+  - name: publish-rootless
+    image: techknowlogick/drone-docker:latest
+    settings:
+      dockerfile: Dockerfile.rootless
+      auto_tag: false
+      tags: dev-linux-amd64-rootless
+      repo: gitea/gitea
+      build_args:
+        - GOPROXY=off
+      password:
+        from_secret: docker_password
+      username:
+        from_secret: docker_username
+    environment:
+      PLUGIN_MIRROR:
+        from_secret: plugin_mirror
+    when:
+      event:
+        exclude:
+        - pull_request
+
+---
+kind: pipeline
+name: docker-linux-amd64-release-branch
+
+platform:
+  os: linux
+  arch: amd64
+
+depends_on:
+  - testing-amd64
+  - testing-arm64
+
+trigger:
+  ref:
   - "refs/heads/release/v*"
   event:
     exclude:
@@ -795,7 +858,7 @@ steps:
     image: techknowlogick/drone-docker:latest
     settings:
       auto_tag: false
-      tags: ${DRONE_COMMIT_REF##refs/heads/release/v}${${DRONE_COMMIT_REF##refs/heads/release/v}:+-}dev-linux-amd64
+      tags: ${DRONE_BRANCH##release/v}-dev-linux-amd64
       repo: gitea/gitea
       build_args:
         - GOPROXY=off
@@ -813,7 +876,7 @@ steps:
     settings:
       dockerfile: Dockerfile.rootless
       auto_tag: false
-      tags: ${DRONE_COMMIT_REF##refs/heads/release/v}${${DRONE_COMMIT_REF##refs/heads/release/v}:+-}dev-linux-amd64-rootless
+      tags: ${DRONE_BRANCH##release/v}-dev-linux-amd64-rootless
       repo: gitea/gitea
       build_args:
         - GOPROXY=off
@@ -943,6 +1006,72 @@ depends_on:
 trigger:
   ref:
   - refs/heads/main
+  event:
+    exclude:
+    - cron
+
+steps:
+  - name: fetch-tags
+    image: docker:git
+    commands:
+      - git fetch --tags --force
+
+  - name: publish
+    pull: always
+    image: techknowlogick/drone-docker:latest
+    settings:
+      auto_tag: false
+      tags: dev-linux-arm64
+      repo: gitea/gitea
+      build_args:
+        - GOPROXY=off
+      password:
+        from_secret: docker_password
+      username:
+        from_secret: docker_username
+    environment:
+      PLUGIN_MIRROR:
+        from_secret: plugin_mirror
+    when:
+      event:
+        exclude:
+        - pull_request
+
+  - name: publish-rootless
+    image: techknowlogick/drone-docker:latest
+    settings:
+      dockerfile: Dockerfile.rootless
+      auto_tag: false
+      tags: dev-linux-arm64-rootless
+      repo: gitea/gitea
+      build_args:
+        - GOPROXY=off
+      password:
+        from_secret: docker_password
+      username:
+        from_secret: docker_username
+    environment:
+      PLUGIN_MIRROR:
+        from_secret: plugin_mirror
+    when:
+      event:
+        exclude:
+        - pull_request
+
+---
+kind: pipeline
+name: docker-linux-arm64-release-branch
+
+platform:
+  os: linux
+  arch: arm64
+
+depends_on:
+  - testing-amd64
+  - testing-arm64
+
+trigger:
+  ref:
   - "refs/heads/release/v*"
   event:
     exclude:
@@ -959,7 +1088,7 @@ steps:
     image: techknowlogick/drone-docker:latest
     settings:
       auto_tag: false
-      tags: ${DRONE_COMMIT_REF##refs/heads/release/v}${${DRONE_COMMIT_REF##refs/heads/release/v}:+-}dev-linux-arm64
+      tags: ${DRONE_BRANCH##release/v}-dev-linux-arm64
       repo: gitea/gitea
       build_args:
         - GOPROXY=off
@@ -980,7 +1109,7 @@ steps:
     settings:
       dockerfile: Dockerfile.rootless
       auto_tag: false
-      tags: ${DRONE_COMMIT_REF##refs/heads/release/v}${${DRONE_COMMIT_REF##refs/heads/release/v}:+-}dev-linux-arm64-rootless
+      tags: ${DRONE_BRANCH##release/v}-dev-linux-arm64-rootless
       repo: gitea/gitea
       build_args:
         - GOPROXY=off
@@ -995,6 +1124,7 @@ steps:
       event:
         exclude:
         - pull_request
+
 ---
 kind: pipeline
 name: docker-manifest-version
@@ -1083,6 +1213,8 @@ trigger:
 depends_on:
   - docker-linux-amd64-release
   - docker-linux-arm64-release
+  - docker-linux-amd64-release-branch
+  - docker-linux-arm64-release-branch
 
 ---
 kind: pipeline