diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc7968d..b24b80d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: ci build on: pull_request: jobs: - build: + ci_build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -15,5 +15,5 @@ jobs: - name: Build run: npm run build env: - CI_DELAY: "10000" + CI_DELAY: "60000" CI_FAIL: "" diff --git a/.github/workflows/merge_queue.yml b/.github/workflows/merge_queue.yml index 111b2e4..cc57c62 100644 --- a/.github/workflows/merge_queue.yml +++ b/.github/workflows/merge_queue.yml @@ -1,12 +1,10 @@ name: merge queueu on: + pull_request: merge_group: - types: [checks_requested] - push: - branches: - - gh-readonly-queue/main/* jobs: - build: + merge_build: + if: ${{ github.event_name == 'merge_group' }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -19,5 +17,5 @@ jobs: - name: Build run: npm run build env: - CI_DELAY: "60000" - CI_FAIL: "1" + CI_DELAY: "10000" + CI_FAIL: ""