diff --git a/.github/workflows/commit-queue.yml b/.github/workflows/commit-queue.yml index ac57fbb0e01..0dc1d93416c 100644 --- a/.github/workflows/commit-queue.yml +++ b/.github/workflows/commit-queue.yml @@ -12,6 +12,8 @@ on: # secrets, which it needs to access Jenkins API. schedule: - cron: '*/5 * * * *' + workflow_dispatch: + concurrency: ${{ github.workflow }} @@ -25,7 +27,7 @@ jobs: get_mergeable_prs: permissions: pull-requests: read - if: github.repository == 'nodejs/node' + # if: github.repository == 'nodejs/node' runs-on: ubuntu-latest outputs: numbers: ${{ steps.get_mergeable_prs.outputs.numbers }} @@ -33,13 +35,28 @@ jobs: - name: Get Pull Requests id: get_mergeable_prs run: > - gh pr list \ + prs=$(gh pr list \ --repo ${{ github.repository }} \ --base ${{ github.ref_name }} \ --label 'commit-queue' \ --json 'number' \ - -t '::set-output name=numbers::{{ range . }}{{ .number }} {{ end }}' \ - --limit 100 + --search "created:<=$(date --date="2 days ago" +"%Y-%m-%dT%H:%M:%S%z")" \ + -t '{{ range . }}{{ .number }} {{ end }}' \ + --limit 100) + fast_track_prs=$(gh pr list \ + --repo ${{ github.repository }} \ + --base ${{ github.ref_name }} \ + --label 'commit-queue' \ + --label 'fast-track' \ + --json 'number' \ + -t '{{ range . }}{{ .number }} {{ end }}' \ + --limit 100) + numbers=$(echo $prs' '$fast_track_prs | jq -r -s 'unique | join(" ")') + echo $prs + echo $fast_track_prs + echo $numbers + echo $(date --date="2 days ago" +"%Y-%m-%dT%H:%M:%S%z") + echo "numbers=$numbers" >> $GITHUB_OUTPUT env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} commitQueue: @@ -47,41 +64,42 @@ jobs: if: needs.get_mergeable_prs.outputs.numbers != '' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - with: - # Needs the whole git history for ncu to work - # See https://github.com/nodejs/node-core-utils/pull/486 - fetch-depth: 0 - # A personal token is required because pushing with GITHUB_TOKEN will - # prevent commits from running CI after they land. It needs - # to be set here because `checkout` configures GitHub authentication - # for push as well. - token: ${{ secrets.GH_USER_TOKEN }} + - run: echo ${{ needs.get_mergeable_prs.outputs.numbers }} + # - uses: actions/checkout@v3 + # with: + # # Needs the whole git history for ncu to work + # # See https://github.com/nodejs/node-core-utils/pull/486 + # fetch-depth: 0 + # # A personal token is required because pushing with GITHUB_TOKEN will + # # prevent commits from running CI after they land. It needs + # # to be set here because `checkout` configures GitHub authentication + # # for push as well. + # token: ${{ secrets.GH_USER_TOKEN }} - # Install dependencies - - name: Install Node.js - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODE_VERSION }} - - name: Install node-core-utils - run: npm install -g node-core-utils@latest + # # Install dependencies + # - name: Install Node.js + # uses: actions/setup-node@v3 + # with: + # node-version: ${{ env.NODE_VERSION }} + # - name: Install node-core-utils + # run: npm install -g node-core-utils@latest - - name: Set variables - run: | - echo "REPOSITORY=$(echo ${{ github.repository }} | cut -d/ -f2)" >> $GITHUB_ENV - echo "OWNER=${{ github.repository_owner }}" >> $GITHUB_ENV + # - name: Set variables + # run: | + # echo "REPOSITORY=$(echo ${{ github.repository }} | cut -d/ -f2)" >> $GITHUB_ENV + # echo "OWNER=${{ github.repository_owner }}" >> $GITHUB_ENV - - name: Configure node-core-utils - run: | - ncu-config set branch ${GITHUB_REF_NAME} - ncu-config set upstream origin - ncu-config set username "${{ secrets.GH_USER_NAME }}" - ncu-config set token "${{ secrets.GH_USER_TOKEN }}" - ncu-config set jenkins_token "${{ secrets.JENKINS_TOKEN }}" - ncu-config set repo "${REPOSITORY}" - ncu-config set owner "${OWNER}" + # - name: Configure node-core-utils + # run: | + # ncu-config set branch ${GITHUB_REF_NAME} + # ncu-config set upstream origin + # ncu-config set username "${{ secrets.GH_USER_NAME }}" + # ncu-config set token "${{ secrets.GH_USER_TOKEN }}" + # ncu-config set jenkins_token "${{ secrets.JENKINS_TOKEN }}" + # ncu-config set repo "${REPOSITORY}" + # ncu-config set owner "${OWNER}" - - name: Start the Commit Queue - run: ./tools/actions/commit-queue.sh ${{ env.OWNER }} ${{ env.REPOSITORY }} ${{ needs.get_mergeable_prs.outputs.numbers }} - env: - GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }} + # - name: Start the Commit Queue + # run: ./tools/actions/commit-queue.sh ${{ env.OWNER }} ${{ env.REPOSITORY }} ${{ needs.get_mergeable_prs.outputs.numbers }} + # env: + # GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }}