Skip to content

Commit

Permalink
fix: job workflow as per circleci existing workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
mahesh-naxa committed Sep 17, 2024
1 parent f6658b2 commit e5de9ce
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
docker compose --file docker-compose.yml logs tm-backend
compose_service: tm-backend
build_target: prod
# TODO: Compose command to be updated once dev have test setup running. For now just a simple curl command.
compose_command: curl -i http://localhost:5000/api/v2/
tag_override: ci-${{ github.ref_name }}
# coverage: true
Expand All @@ -34,6 +35,8 @@ jobs:
secrets: inherit

backend-build:
needs:
- backend-test
uses: hotosm/gh-workflows/.github/workflows/[email protected]
with:
context: .
Expand All @@ -51,6 +54,7 @@ jobs:
context: ./frontend
cache-key-file: ./frontend/yarn.lock
package-manager: yarn
# TODO: Verify this with frontend team
test_frontend_command: |
CI=true yarn test -w 1
# test_frontend_build: false
Expand All @@ -60,6 +64,8 @@ jobs:
frontend-build:
uses: naxa-developers/tasking-manager/.github/workflows/frontend-build.yml@ci-gh-workflows
secrets: inherit
needs:
- frontend-test
with:
node-version: 16.x
context: ./frontend
Expand Down Expand Up @@ -88,8 +94,8 @@ jobs:
backend_deploy_to_vm:
name: Deploy Backend to VM
needs:
- backend-test
- backend-build
- frontend-build
uses: naxa-developers/tasking-manager/.github/workflows/remote_deploy_compose.yml@ci-gh-workflows
with:
docker_compose_file: docker-compose.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ on:
value: ${{ jobs.node-build.outputs.artifact-name }}

jobs:
node-build:
frontend-build:
runs-on: ${{ inputs.runner-class }}

environment:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ on:


jobs:
node-build:
frontend-test:
runs-on: ${{ inputs.runner-class }}

environment:
Expand Down

0 comments on commit e5de9ce

Please sign in to comment.