Skip to content

Commit

Permalink
In all uses yml have relative path (#12)
Browse files Browse the repository at this point in the history
* Use relative path in all CI yml uses

* CI: fix workflow name
  • Loading branch information
JonJagger committed Dec 1, 2023
1 parent e71ee4d commit 2b8fa1d
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy-manually.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ on:

jobs:
deploy_to_beta:
uses: cyber-dojo/differ/.github/workflows/sub_deploy_to_beta.yml@main
uses: ./.github/workflows/sub_deploy_to_beta.yml
with:
IMAGE_TAG: ${{ github.event.inputs.image_tag }}

deploy_to_prod:
uses: cyber-dojo/differ/.github/workflows/sub_deploy_to_prod.yml@main
uses: ./.github/workflows/sub_deploy_to_prod.yml
with:
IMAGE_TAG: ${{ github.event.inputs.image_tag }}
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

build-image:
needs: [variables, create-kosli-flow]
uses: cyber-dojo/differ/.github/workflows/sub_build_image.yml@main
uses: ./.github/workflows/sub_build_image.yml
secrets:
KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
Expand All @@ -33,7 +33,7 @@ jobs:

test:
needs: [variables, build-image]
uses: cyber-dojo/differ/.github/workflows/sub_test.yml@main
uses: ./.github/workflows/sub_test.yml
secrets:
KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
Expand All @@ -42,15 +42,15 @@ jobs:

sdlc-gate:
needs: [variables, test]
uses: cyber-dojo/differ/.github/workflows/sub_sdlc_gate.yml@main
uses: ./.github/workflows/sub_sdlc_gate.yml
secrets:
KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
with:
IMAGE_TAG: ${{ needs.variables.outputs.image_tag }}

approve-deployment-to-beta:
needs: [variables, sdlc-gate]
uses: cyber-dojo/differ/.github/workflows/sub_approve_deployment.yml@main
uses: ./.github/workflows/sub_approve_deployment.yml
secrets:
KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
with:
Expand All @@ -59,13 +59,13 @@ jobs:

deploy-to-beta:
needs: [variables, approve-deployment-to-beta]
uses: cyber-dojo/differ/.github/workflows/sub_deploy_to_beta.yml@main
uses: ./.github/workflows/sub_deploy_to_beta.yml
with:
IMAGE_TAG: ${{ needs.variables.outputs.image_tag }}

approve-deployment-to-prod:
needs: [variables, deploy-to-beta]
uses: cyber-dojo/differ/.github/workflows/sub_approve_deployment.yml@main
uses: ./.github/workflows/sub_approve_deployment.yml
secrets:
KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
with:
Expand All @@ -74,6 +74,6 @@ jobs:

deploy-to-prod:
needs: [variables, approve-deployment-to-prod]
uses: cyber-dojo/differ/.github/workflows/sub_deploy_to_prod.yml@main
uses: ./.github/workflows/sub_deploy_to_prod.yml
with:
IMAGE_TAG: ${{ needs.variables.outputs.image_tag }}
12 changes: 6 additions & 6 deletions .github/workflows/main_staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
echo "kosli_host=${{ env.KOSLI_HOST }}" >> ${GITHUB_OUTPUT}
create-kosli-flow:
uses: cyber-dojo/differ/.github/workflows/sub_create_kosli_flow.yml@main
uses: ./.github/workflows/sub_create_kosli_flow.yml
secrets:
KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
with:
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
test:
needs: [variables, wait-for-image]
uses: cyber-dojo/differ/.github/workflows/sub_test.yml@main
uses: ./.github/workflows/sub_test.yml
secrets:
KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
Expand All @@ -68,7 +68,7 @@ jobs:

sdlc-gate:
needs: [variables, test]
uses: cyber-dojo/differ/.github/workflows/sub_sdlc_gate.yml@main
uses: ./.github/workflows/sub_sdlc_gate.yml
secrets:
KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
with:
Expand All @@ -77,7 +77,7 @@ jobs:

approve-deployment-to-beta:
needs: [variables, sdlc-gate]
uses: cyber-dojo/differ/.github/workflows/sub_approve_deployment.yml@main
uses: ./.github/workflows/sub_approve_deployment.yml
secrets:
KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
with:
Expand All @@ -87,7 +87,7 @@ jobs:

approve-deployment-to-prod:
needs: [variables, approve-deployment-to-beta]
uses: cyber-dojo/differ/.github/workflows/sub_approve_deployment.yml@main
uses: ./.github/workflows/sub_approve_deployment.yml
secrets:
KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
with:
Expand All @@ -97,7 +97,7 @@ jobs:

push-latest:
needs: [variables, approve-deployment-to-prod]
uses: cyber-dojo/differ/.github/workflows/sub_push_latest.yml@main
uses: ./.github/workflows/sub_push_latest.yml
secrets:
DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
DOCKER_USER: ${{ secrets.DOCKER_USER }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sub_create_kosli_flow.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Sub - push :latest image to dockerhub
name: Sub - create kosli flow

on:
workflow_call:
Expand Down

0 comments on commit 2b8fa1d

Please sign in to comment.