.drone.yml

@@ -22,8 +22,6 @@ steps:
 trigger:
     event:
       - tag
-    branch:
-      - main
 ---
 name: amd64-docker
 kind: pipeline
@@ -44,8 +42,6 @@ steps:
 trigger:
     event:
       - tag
-    branch:
-      - main
 ---
 name: arm64-docker
 kind: pipeline
@@ -73,8 +69,6 @@ steps:
 trigger:
     event:
       - tag
-    branch:
-      - main
 volumes:
     - name: ssh_key
       host:
@@ -106,8 +100,6 @@ steps:
 trigger:
     event:
       - tag
-    branch:
-      - main
 volumes:
     - name: ssh_key
       host:
@@ -135,16 +127,11 @@ steps:
           key_path: /root/drone_rsa
           command_timeout: 50m
           script:
-              - docker pull hrfee/jfa-go:manifest-latest-amd64
-              - docker pull hrfee/jfa-go:manifest-latest-arm64
-              - docker pull hrfee/jfa-go:manifest-latest-armhf
               - env DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create hrfee/jfa-go:latest --amend hrfee/jfa-go:manifest-latest-amd64 --amend hrfee/jfa-go:manifest-latest-arm64 --amend hrfee/jfa-go:manifest-latest-armhf
               - env DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push hrfee/jfa-go:latest
 trigger:
     event:
       - tag
-    branch:
-      - main
 volumes:
     - name: ssh_key
       host:
@@ -198,13 +185,6 @@ steps:
           repo: hrfee/jfa-go
           tags: manifest-unstable-amd64
 
-trigger:
-    branch:
-        - main
-    event:
-        exclude:
-            - pull_request
-
 ---
 name: arm64-docker-git
 kind: pipeline
@@ -233,6 +213,7 @@ steps:
 trigger:
     branch:
         - main
+        - go1.16
     event:
         exclude:
             - pull_request
@@ -269,6 +250,7 @@ steps:
 trigger:
     branch:
         - main
+        - go1.16
     event:
         exclude:
             - pull_request
@@ -290,19 +272,16 @@ steps:
             path: /root/drone_rsa
       settings:
           host:
-              from_secret: ssh2_host
+              from_secret: ssh_host
           username:
-              from_secret: ssh2_username
+              from_secret: ssh_username
           port:
-              from_secret: ssh2_port
+              from_secret: ssh_port
           volumes:
               - /root/.ssh/docker-build:/root/drone_rsa
           key_path: /root/drone_rsa
           command_timeout: 50m
           script:
-              - docker pull hrfee/jfa-go:manifest-unstable-amd64
-              - docker pull hrfee/jfa-go:manifest-unstable-arm64
-              - docker pull hrfee/jfa-go:manifest-unstable-armhf
               - env DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create hrfee/jfa-go:unstable --amend hrfee/jfa-go:manifest-unstable-amd64 --amend hrfee/jfa-go:manifest-unstable-arm64 --amend hrfee/jfa-go:manifest-unstable-armhf
               - env DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push hrfee/jfa-go:unstable
 depends_on:
@@ -312,6 +291,7 @@ depends_on:
 trigger:
     branch:
         - main
+        - go1.16
     event:
         exclude:
             - pull_request