Skip to content

Commit

Permalink
Remove -it option from docker run command in test.sh as on CI you don…
Browse files Browse the repository at this point in the history
…t have a tty; reinstate running tests in .github/workflows/main.yml
  • Loading branch information
JonJagger committed Aug 18, 2022
1 parent ab6f4ae commit 7430085
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ jobs:
CIRCLE_BUILD_URL: ${{github.server_url}}/${{github.repository}}/actions/runs/${{github.run_id}}
#disable tests for now due to "the input device is not a TTY" error
#BUILD_COMMAND: "scripts/merkely_declare_pipeline.sh && ./build.sh && ./up.sh && ./wait.sh && ./test.sh && ./scripts/images_push.sh && ./scripts/merkely_log_artifact.sh && ./scripts/merkely_log_evidence.sh"
BUILD_COMMAND: "scripts/merkely_declare_pipeline.sh && ./build.sh && ./up.sh && ./wait.sh && ./scripts/images_push.sh && ./scripts/merkely_log_artifact.sh"
BUILD_COMMAND: "scripts/merkely_declare_pipeline.sh && ./build.sh && ./up.sh && ./wait.sh && ./test.sh && ./scripts/images_push.sh && ./scripts/merkely_log_artifact.sh"
tag: ${{ needs.pre-build.outputs.tag }}
AWS_ACCOUNT_ID: 244531986313
AWS_REGION: eu-central-1
ecr_registry: 244531986313.dkr.ecr.eu-central-1.amazonaws.com
service_name: saver
gh_actions_iam_role_name: gh_actions_services

deploy-staging:
needs: [pre-build, build-test-push]
uses: cyber-dojo/reusable-actions-workflows/.github/workflows/deploy.yml@master
Expand Down
1 change: 0 additions & 1 deletion test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ run_tests()
--env COVERAGE_ROOT=${CONTAINER_COVERAGE_DIR} \
--env COVERAGE_CODE_TAB_NAME=${COVERAGE_CODE_TAB_NAME} \
--env COVERAGE_TEST_TAB_NAME=${COVERAGE_TEST_TAB_NAME} \
-it \
--user "${user}" \
"${cid}" \
sh -c "/app/test/config/run.sh ${TEST_LOG} ${*:4}"
Expand Down

0 comments on commit 7430085

Please sign in to comment.