update main

Author: snickell

.drone.yml

@@ -1,58 +1,37 @@
 ---
-name: sleep-for-10s
-kind: pipeline
-type: docker
-clone:
-  disable: true
-steps:
-  - name: sleep
-    image: alpine
-    commands:
-      - sleep 10
-trigger:
-  branch:
-    exclude:
-      - "production"
-      - "test"
-      - "levelbuilder"
-  event:
-    - pull_request
 
----
 kind: pipeline
 type: docker
-name: trigger-github-workflow-on-droneci-success
+name: on-droneci-complete
 clone:
   disable: true
 steps:
-  - name: trigger-gh
+  - name: trigger-github-actions
     image: plugins/webhook
     settings:
       urls:
-        - https://api.github.com/repos/code-dot-org/code-dot-org/actions/workflows/on-droneci-success.yml/dispatches
+        - https://api.github.com/repos/code-dot-org/test-workflow-dispatch/actions/workflows/on-droneci-complete.yml/dispatches
       username: x-access-token
       secrets:
-        - source: github_token_on_droneci_success
+        - source: on-droneci-complete-github-token
           target: webhook_password
       template: |
         {
           "ref": "{{ build.branch }}",
           "inputs": {
-            "commit": "{{ build.commit }}"
+            "github_sha": "{{ build.commit }}",
+            "drone_succeeded": {{ eq build.status 'success' }}
           }
         }
       debug: true
-depends_on:
-  - sleep-for-10s
-  # - unit
-  # - ui
+# depends_on:
+#   - unit
+#   - ui
 trigger:
   event:
     - pull_request
-  status:
-    - success
 ---
 kind: signature
-hmac: 41d486edcab857043b4bb1f9f5c24dd1bdb560a24f5e5ecb25ca196edf6013db
+hmac: 64f80f45bacfea906a0a36dedfb08b3f5c8394d2aacfb182e6104300965e2bb5
 
 ...

.github/workflows/on-droneci-complete.yml

@@ -6,52 +6,64 @@ on:
       github_sha:
         description: "equivalent to github.sha in an ordinary workflow"
         required: true
-      success:
+      drone_succeeded:
         description: "did drone tests pass or fail?"
         required: true
         type: boolean
 
+permissions:
+  statuses: write
+
 jobs:
   # This one should pass
   cms-followup:
     runs-on: ubuntu-24.04
+    if: ${{ inputs.drone_succeeded }}
     # uses: ./.github/workflows/cms-followup.yml
     steps:
       - run: |
-          echo "Triggered by Drone commit: ${{ inputs.github_sha }} on branch ${{ github.ref }}"
-          echo "This step should succeed"
+          echo "Triggered by Drone, on commit: ${{ inputs.github_sha }} on branch ${{ github.ref }}"
+          echo "This job should succeed"
           true
 
       # Need to update commit status manually, or the result won't be visible within the PR:
       - uses: actions/github-script@v7
+        if: always()
         with:
           script: |
             await github.rest.repos.createCommitStatus({
               context: 'CMS Followup',
+              description: 'blah blah blah',
               owner: context.repo.owner,
               repo: context.repo.repo,
               sha: '${{ inputs.github_sha }}',
-              state: ${{ job.status == 'success' && 'success' || 'failure' }}
+              state: '${{ job.status == 'success' && 'success' || 'failure' }}'
             })
 
   # This one should fail
   k8s-followup:
     runs-on: ubuntu-24.04
+    if: ${{ inputs.drone_succeeded }}
     # uses: ./.github/workflows/k8s-followup.yml
     steps:
       - run: |
-          echo "Triggered by Drone commit: ${{ inputs.github_sha }} on branch ${{ github.ref }}"
-          echo "This step should fail"
+          echo "Triggered by Drone, on commit: ${{ inputs.github_sha }} on branch ${{ github.ref }}"
+          echo "This job should fail"
           false
 
+      - if: always()
+        run: echo "k"
+
       # Need to update commit status manually, or the result won't be visible within the PR:
       - uses: actions/github-script@v7
+        if: always()
         with:
           script: |
             await github.rest.repos.createCommitStatus({
               context: 'K8S Followup',
+              description: 'blah blah blah',
               owner: context.repo.owner,
               repo: context.repo.repo,
               sha: '${{ inputs.github_sha }}',
-              state: ${{ job.status == 'success' && 'success' || 'failure' }}
+              state: '${{ job.status == 'success' && 'success' || 'failure' }}'
             })