diff --git a/.github/workflows/call_webhook.yml b/.github/workflows/call_webhook.yml index 1a55b40e3..130c7eab4 100644 --- a/.github/workflows/call_webhook.yml +++ b/.github/workflows/call_webhook.yml @@ -29,7 +29,7 @@ jobs: } EOF ) - + curl -L \ -X POST \ -H "Accept: application/vnd.github+json" \ diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 52e359569..c77500edc 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -3,6 +3,13 @@ name: Integration Checks on: workflow_dispatch: pull_request: + push: + branches: + - master + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: appserver: @@ -13,13 +20,7 @@ jobs: DOCKER_COMPOSE_CMD: docker compose -f docker-compose.ci-test.yml steps: - - name: Cancel Previous Runs - if: github.event_name != 'workflow_dispatch' - uses: styfle/cancel-workflow-action@0.10.0 - with: - access_token: ${{ github.token }} - - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Create environment variable to pass in GitHub hash for Docker Compose run: echo "GITHUB_HASH=${{ github.sha }}" >> .env