WIP

.woodpecker/.build.yaml

@@ -16,29 +16,20 @@ steps:
         - 'latest'
         - ${CI_COMMIT_SHA}
 
-  # build-branch:
-  #   when:
-  #     - event: push
-  #       branch:
-  #         exclude: ['main']
-  #   image: woodpeckerci/plugin-docker-buildx:4.0.0@sha256:9d24b71c37d7a958d79252e608c4d1a04b02f2e74d4e26003b43e0830038bde0
-  #   pull: true
-  #   settings:
-  #     platforms: linux/amd64
-  #     registry: ${CI_FORGE_URL}
-  #     username: WoodpeckerCI
-  #     password:
-  #       from_secret: gitea_token
-  #     repo: git.verdigado.com/${CI_REPO,,}
-  #     tags:
-  #       - ${CI_COMMIT_BRANCH}
-  #       - ${CI_COMMIT_SHA}
-
-  sleep:
+  build-branch:
     when:
-      event: push
-    # depends_on:
-    #   - build-branch
-    image: alpine
-    commands:
-      - sleep 600
+      - event: push
+        branch:
+          exclude: ['main']
+    image: woodpeckerci/plugin-docker-buildx:4.0.0@sha256:9d24b71c37d7a958d79252e608c4d1a04b02f2e74d4e26003b43e0830038bde0
+    pull: true
+    settings:
+      platforms: linux/amd64
+      registry: ${CI_FORGE_URL}
+      username: WoodpeckerCI
+      password:
+        from_secret: gitea_token
+      repo: git.verdigado.com/${CI_REPO,,}
+      tags:
+        - ${CI_COMMIT_BRANCH}
+        - ${CI_COMMIT_SHA}

.woodpecker/.test.yaml

@@ -25,12 +25,16 @@ steps:
       test: *image
     commands:
       - 'echo image: *image'
-      - 'echo $test'
+      - 'echo pulling $test'
+      - while ! docker pull $test ; do echo try; sleep 1; done
 
-  # salt pre-commit:
-  #   image: *image
-  #   environment:
-  #     - SKIP=no-commit-to-branch # Ignore "don't commit to protected branch" check
-  #   commands:
-  #     - cd salt
-  #     - pre-commit run --all-files
+  salt pre-commit:
+    image: *image
+    depends_on:
+      - debug
+      - salt clone
+    environment:
+      - SKIP=no-commit-to-branch # Ignore "don't commit to protected branch" check
+    commands:
+      - cd salt
+      - pre-commit run --all-files