diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2899b7d90..5f6336507 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -106,17 +106,9 @@ jobs: runs-on: ubuntu-latest steps: - shell: bash - run: echo "github.ref" + run: echo "github.event.merge_queue" - shell: bash - run: echo ${{ github.ref }} - - shell: bash - run: echo "github.event.merge_queue.head.repo.full_name" - - shell: bash - run: echo ${{ github.event.merge_queue.head.repo.full_name }} - - shell: bash - run: echo "github.repository" - - shell: bash - run: echo ${{ github.repository }} + run: echo ${{ github.event.merge_queue }} # ---------------------------------------------------------------------------------------------------- # --- Website Linting ----------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------- @@ -146,15 +138,10 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 120 if: | - ( - startsWith(github.ref, 'refs/tags/') - || github.ref == 'refs/heads/gh-readonly-queue/main' - || github.ref == 'refs/heads/main' - ) - || ( - needs.precheck.outputs.srcfileschanged == 'true' - && github.event.pull_request.head.repo.full_name == github.repository - ) + startsWith(github.ref, 'refs/tags/') + || startsWith(github.ref, 'refs/heads/gh-readonly-queue/main') + || github.ref == 'refs/heads/main' + || (needs.precheck.outputs.srcfileschanged == 'true' && github.event.pull_request.head.repo.full_name == github.repository) defaults: run: working-directory: src