diff --git a/.github/workflows/triage-issue-comments.yml b/.github/workflows/triage-issue-comments.yml index 2d609b758faf..fc405050f8ea 100644 --- a/.github/workflows/triage-issue-comments.yml +++ b/.github/workflows/triage-issue-comments.yml @@ -1,6 +1,51 @@ name: Triage new issue comments on: issue_comment: +<<<<<<< HEAD + types: [created] + +jobs: + triage-issue-comments: + if: github.repository == 'github/docs' + runs-on: ubuntu-latest + + steps: + - name: Check if the event originated from a team member + uses: actions/github-script@v2.0.0 + id: set-result + with: + github-token: ${{secrets.GITHUB_TOKEN}} + result-encoding: string + script: | + const repo = context.payload.repository.name + const org = context.payload.repository.owner.login + const actor = context.actor + let collaboratorStatus = '' + try { + collaboratorStatus = await github.request('GET /repos/{owner}/{repo}/collaborators/{username}', { + owner: org, + repo: repo, + username: actor + }) + console.log(`This issue was commented on by a Hubber.`) + return 'true' + } catch (error) { + console.log(`This issue was commented on by an external contributor.`) + return 'false' + } + - name: Label issues with new comments with 'triage' + uses: andymckay/labeler@v1.0.2 + if: (steps.set-result.outputs.result == 'false') + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" + add-labels: "triage" + - name: Triage to project board + uses: konradpabjan/actions-add-new-issue-to-column@v1.1 + with: + action-token: ${{ secrets.GITHUB_TOKEN }} + project-url: "https://github.com/github/docs/projects/1" + column-name: "Triage" +======= types: - created @@ -45,3 +90,4 @@ jobs: action-token: ${{ secrets.GITHUB_TOKEN }} project-url: 'https://github.com/github/docs/projects/1' column-name: 'Triage' +>>>>>>> 9ad2df1e7080b3c7d3e74d068674709927f97578 diff --git a/.github/workflows/triage-issues.yml b/.github/workflows/triage-issues.yml index 61280b515410..271916c77d90 100644 --- a/.github/workflows/triage-issues.yml +++ b/.github/workflows/triage-issues.yml @@ -1,9 +1,13 @@ name: Triage new issues on: issues: +<<<<<<< HEAD + types: [reopened, opened] +======= types: - reopened - opened +>>>>>>> 9ad2df1e7080b3c7d3e74d068674709927f97578 jobs: triage_issues: @@ -11,6 +15,19 @@ jobs: runs-on: ubuntu-latest steps: +<<<<<<< HEAD + - name: Label new issues with 'triage' + uses: andymckay/labeler@v1.0.2 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" + add-labels: "triage" + - name: Triage to project board + uses: konradpabjan/actions-add-new-issue-to-column@v1.1 + with: + action-token: ${{ secrets.GITHUB_TOKEN }} + project-url: "https://github.com/github/docs/projects/1" + column-name: "Triage" +======= - name: Label new issues with 'triage' uses: rachmari/labeler@832d42ec5523f3c6d46e8168de71cd54363e3e2e with: @@ -22,3 +39,4 @@ jobs: action-token: ${{ secrets.GITHUB_TOKEN }} project-url: 'https://github.com/github/docs/projects/1' column-name: 'Triage' +>>>>>>> 9ad2df1e7080b3c7d3e74d068674709927f97578 diff --git a/.github/workflows/triage-pull-requests.yml b/.github/workflows/triage-pull-requests.yml index f83ff5c9e8d5..1b811fc8f22f 100644 --- a/.github/workflows/triage-pull-requests.yml +++ b/.github/workflows/triage-pull-requests.yml @@ -1,16 +1,36 @@ name: Triage new pull requests on: pull_request: +<<<<<<< HEAD + types: [reopened, opened] + +jobs: + triage_issues: +======= types: - reopened - opened jobs: triage_pulls: +>>>>>>> 9ad2df1e7080b3c7d3e74d068674709927f97578 if: github.repository == 'github/docs' runs-on: ubuntu-latest steps: +<<<<<<< HEAD + - name: Label new pull requests with 'triage' + uses: andymckay/labeler@v1.0.2 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" + add-labels: "triage" + - name: Triage to project board + uses: konradpabjan/actions-add-new-issue-to-column@v1.1 + with: + action-token: ${{ secrets.GITHUB_TOKEN }} + project-url: "https://github.com/github/docs/projects/1" + column-name: "Triage" +======= - name: Label new pull requests with 'triage' uses: rachmari/labeler@832d42ec5523f3c6d46e8168de71cd54363e3e2e with: @@ -22,3 +42,4 @@ jobs: action-token: ${{ secrets.GITHUB_TOKEN }} project-url: 'https://github.com/github/docs/projects/1' column-name: 'Triage' +>>>>>>> 9ad2df1e7080b3c7d3e74d068674709927f97578 diff --git a/.github/workflows/triage-stale-check.yml b/.github/workflows/triage-stale-check.yml index 4fd8cd8fccf4..a0e9451e5377 100644 --- a/.github/workflows/triage-stale-check.yml +++ b/.github/workflows/triage-stale-check.yml @@ -1,12 +1,33 @@ +<<<<<<< HEAD +name: 14 Days Stale Check +on: + schedule: + - cron: "40 16 * * *" # Run each day at 16:40 UTC / 8:40 PST +======= name: Public Repo Stale Check on: schedule: - cron: '45 16 * * *' # Run each day at 16:45 UTC / 8:45 PST +>>>>>>> 9ad2df1e7080b3c7d3e74d068674709927f97578 jobs: stale: if: github.repository == 'github/docs' runs-on: ubuntu-latest +<<<<<<< HEAD + + steps: + - uses: actions/stale@v3 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + stale-issue-message: 'This issue is stale because it has been open 60 days with no activity.' + stale-pr-message: 'This PR is stale because it has been open 60 days with no activity.' + days-before-stale: 14 + days-before-close: 7 + stale-issue-label: 'stale' + stale-pr-label: 'stale' + +======= steps: - uses: actions/stale@af4072615903a8b031f986d25b1ae3bf45ec44d4 @@ -18,3 +39,4 @@ jobs: stale-pr-label: 'stale' exempt-pr-labels: 'never-stale' exempt-issue-labels: 'never-stale' +>>>>>>> 9ad2df1e7080b3c7d3e74d068674709927f97578 diff --git a/content/README.md b/content/README.md index 901427d4be71..f70350d0d611 100644 --- a/content/README.md +++ b/content/README.md @@ -1,5 +1,5 @@ # Content - +:octocat: The `/content` directory is where all the site's (English) Markdown content lives! See the [markup reference guide](/contributing/content-markup-reference.md) for more information about supported Markdown features.