CI: run approve-deployment before expect-deployment

.github/workflows/readme.md → .github/workflows/demos.md

@@ -32,4 +32,7 @@ deploy-manually.yml is a third, manually triggered pipeline, which has two purpo
    Its fingerprint is 388f48140331636dcb230bd8fd896c36e6007cc10c6065ad86a5bda61fe4a110
    This will result in Kosli snapshot with an Artifact with no-provenance.
    Again, this Artifact will be deployed to https://cyber-dojo.org
-   but this Artifact has full and correct functionality.
+   but this Artifact has full and correct functionality.
+
+Note: the lint: job occasionally fails its CI job. 
+   There is typically a spurious failure, and if you re-run the failed jobs it will pass.

.github/workflows/main.yml

@@ -57,15 +57,15 @@ jobs:
       IMAGE_TAG: ${{ needs.variables.outputs.image_tag }}
 
   expect-deployment:
-    needs: [variables, sdlc-gate]
+    needs: [variables, approve-deployment]
     uses: cyber-dojo/differ/.github/workflows/sub_expect_deployment.yml@main
     secrets:
       KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
     with:
       IMAGE_TAG: ${{ needs.variables.outputs.image_tag }}
 
   deploy:
-    needs: [variables, approve-deployment]
+    needs: [variables, expect-deployment]
     uses: cyber-dojo/differ/.github/workflows/sub_deploy.yml@main
     with:
       IMAGE_TAG: ${{ needs.variables.outputs.image_tag }}

.github/workflows/main_staging.yml

@@ -84,7 +84,7 @@ jobs:
       IMAGE_TAG: ${{ needs.variables.outputs.image_tag }}
 
   expected-deployment:
-    needs: [variables, sdlc-gate]
+    needs: [variables, approve-deployment]
     uses: cyber-dojo/differ/.github/workflows/sub_expect_deployment.yml@main
     secrets:
       KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}