diff --git a/.github/workflows/build-solution.yml b/.github/workflows/build-solution.yml index 0ee6cbe..ec46ae7 100644 --- a/.github/workflows/build-solution.yml +++ b/.github/workflows/build-solution.yml @@ -15,9 +15,10 @@ on: required: true PAT: required: true - on: - pull_request_review: - types: [ submitted, edited ] + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] env: CARGO_TERM_COLOR: always @@ -26,7 +27,7 @@ jobs: build: runs-on: ubuntu-20.04 - if: github.event_name == 'pull_request' && github.event.review.state == 'approved' + steps: - name: Pull main repository uses: actions/checkout@v3 @@ -72,12 +73,6 @@ jobs: # Download the latest release of docker-credential-ecr-login aws s3 cp s3://fortanix-internal-artifact-repository/other-packages/docker-credential-ecr-login . - # Make it executable - chmod +x docker-credential-ecr-login - - # Move it to a directory in the PATH - sudo mv docker-credential-ecr-login /usr/local/bin/ - - name: Build Rust code run: | ./build-converter.sh @@ -89,13 +84,14 @@ jobs: run: | ./unit-test-solution.sh - - name: Build application tests container - run: | - ./build-app-tests-container.sh - - - name: Run application tests container - env: - FORTANIX_API_KEY: ${{ secrets.FORTANIX_API_KEY }} - OVERLAYFS_UNIT_TEST_API_KEY: ${{ secrets.OVERLAYFS_UNIT_TEST_API_KEY }} - run: | - ./run-application-tests.sh ${{ env.TESTS_CONTAINER_ECR }} ${{ env.FORTANIX_API_KEY }} +# Will be uncommented in RTE-188 +# - name: Build application tests container +# run: | +# ./build-app-tests-container.sh + +# - name: Run application tests container +# env: +# FORTANIX_API_KEY: ${{ secrets.FORTANIX_API_KEY }} +# OVERLAYFS_UNIT_TEST_API_KEY: ${{ secrets.OVERLAYFS_UNIT_TEST_API_KEY }} +# run: | +# ./run-application-tests.sh ${{ env.TESTS_CONTAINER_ECR }} ${{ env.FORTANIX_API_KEY }} diff --git a/make/salmiac-tests-container.make b/make/salmiac-tests-container.make index 744987b..1e37471 100644 --- a/make/salmiac-tests-container.make +++ b/make/salmiac-tests-container.make @@ -127,4 +127,4 @@ $(TESTS-CONTAINER): $(TESTS-STAGE-CONTENTS) $(TESTS-CONTAINER-APP-TESTS-FILE):: | $(dir $(TESTS-CONTAINER-APP-TESTS-FILE)) -$(eval $(call make-cp-rule,/usr/local/bin/$(DOCKER-AWS-HELPER),$(TESTS-STAGE-DIR)/$(DOCKER-AWS-HELPER))) +$(eval $(call make-cp-rule,/usr/bin/$(DOCKER-AWS-HELPER),$(TESTS-STAGE-DIR)/$(DOCKER-AWS-HELPER)))