Merge branch 'main' into template-test

Author: wesleytodd

.github/ISSUE_TEMPLATE/meeting.md

@@ -34,7 +34,7 @@
 
 Or in your local time:
 
-* https://www.timeanddate.com/worldclock/?iso=<%= date.toZonedDateTimeISO('UTC').toPlainDateTime().toString() %>
+* https://www.timeanddate.com/worldclock/fixedtime.html?msg=<%= encodeURIComponent(title) %>&iso=<%= date.toZonedDateTimeISO('UTC').toPlainDateTime().toString().slice(0, 16).replace(/[-:]/g, '') %>&p1=1440&ah=1
 
 ## Agenda
 

.github/workflows/test.yml

@@ -23,6 +23,7 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - run: npm install
     - run: npm test
+    - run: npm run test:integration-issues
 
   test-templates:
     runs-on: ubuntu-latest
@@ -37,6 +38,8 @@ jobs:
 
   testint:
     runs-on: ubuntu-latest
+    # only run if not a fork PR targeting main repo due to permissions
+    if: ${{ !(github.head_repo || github.event.pull_request.head.repo) || github.repository == (github.head_repo.full_name || github.event.pull_request.head.repo.full_name) }}
     steps:
     - uses: actions/checkout@v4
     - name: Use Node.js 24
@@ -46,10 +49,13 @@ jobs:
     - run: npm install
     - run: npm run test:integration
       env:
-          GITHUB_TOKEN: ${{ secrets.INT_TEST_TOKEN }}
-
+        GITHUB_TOKEN: ${{ secrets.INT_TEST_TOKEN != '' && secrets.INT_TEST_TOKEN || secrets.GITHUB_TOKEN }}
+        GITHUB_REPOSITORY: ${{ github.repository }}
+        GITHUB_HEAD_REPO: ${{ github.head_repo && github.head_repo.full_name || github.event.pull_request.head.repo.full_name || '' }}
   action-in-action:
     runs-on: ubuntu-latest
+    # only run if not a fork PR targeting main repo due to permissions
+    if: ${{ !(github.head_repo || github.event.pull_request.head.repo) || github.repository == (github.head_repo.full_name || github.event.pull_request.head.repo.full_name) }}
     steps:
     - uses: actions/checkout@v4
     - name: Use Node.js 24
@@ -59,6 +65,9 @@ jobs:
     - run: npm install
     - uses: ./
       id: maker
+      env:
+        TEST_REPOS: ${{ github.repository != 'pkgjs/meet' && github.repository || 'pkgjs/meet,pkgjs/meet' }}
+        TEST_ORGS: ${{ github.repository != 'pkgjs/meet' && '' || 'pkgjs' }}
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         schedules: 2020-04-02T17:00:00.0Z/P1D
@@ -68,7 +77,7 @@ jobs:
         agendaLabel: meeting-agenda-test
         meetingLink: https://github.com/pkgjs/meet
         createNotes: true
-        repos: pkgjs/meet,pkgjs/meet
-        orgs: pkgjs
+        repos: ${{ env.TEST_REPOS }}
+        orgs: ${{ env.TEST_ORGS }}
     - name: clean up issue
       run: node ./test/_close-issue.js ${{ secrets.GITHUB_TOKEN }} ${{ steps.maker.outputs.issueNumber }}

README.md

@@ -167,7 +167,7 @@ When using EJS templates for your meeting issues, the following data properties
 
 Or in your local time:
 
-* https://www.timeanddate.com/worldclock/?iso=<%= date.toZonedDateTimeISO('UTC').toPlainDateTime().toString() %>
+* https://www.timeanddate.com/worldclock/fixedtime.html?msg=<%= encodeURIComponent(title) %>&iso=<%= date.toZonedDateTimeISO('UTC').toPlainDateTime().toString().slice(0, 16).replace(/[-:]/g, '') %>&p1=1440&ah=1
 
 ## Agenda
 

lib/agenda.js

@@ -0,0 +1,57 @@
+'use strict'
+
+/**
+ * get agenda issues and PRs from repositories
+ * @param {Object} client - GitHub client
+ * @param {Array} repos - array of objects with owner and repo properties
+ * @param {string} agendaLabel - label to filter issues and PRs by
+ * @returns {Promise<Array>} array of unique issues and PRs
+ */
+async function fetchAgendaItems (client, repos, agendaLabel) {
+  const agendaIssues = []
+
+  // deduplicate repos
+  const uniqueRepos = [...new Map(
+    repos.map(repo => [`${repo.owner}/${repo.repo}`, repo])
+  ).values()]
+
+  for (const r of uniqueRepos) {
+    const _agendaIssues = await client.paginate('GET /repos/{owner}/{repo}/issues', {
+      owner: r.owner,
+      repo: r.repo,
+      state: 'open',
+      labels: agendaLabel,
+      per_page: 100
+    })
+
+    console.log(`Fetching issues for ${r.owner}/${r.repo}: Found ${_agendaIssues.length}`)
+
+    for (const i of _agendaIssues) {
+      console.log(`Adding Issue: ${i.url}`)
+      agendaIssues.push(i)
+    }
+
+    const _agendaPrs = (await client.paginate('GET /repos/{owner}/{repo}/pulls', {
+      owner: r.owner,
+      repo: r.repo,
+      state: 'open',
+      labels: agendaLabel,
+      per_page: 100
+    })).filter(pr => pr.labels.find(label => label.name === agendaLabel) &&
+                     !(agendaIssues.find((i) => i.url === pr.url))) // workaround for flaky GH API/SDK behavior where sometimes the issue endpoint loads PRs
+
+    console.log(`Fetching PRs for ${r.owner}/${r.repo}: Found ${_agendaPrs.length}`)
+
+    for (const pr of _agendaPrs) {
+      console.log(`Adding PR: ${pr.url}`)
+      agendaIssues.push(pr)
+    }
+  }
+
+  console.log(`Found ${agendaIssues.length} total issues for agenda`)
+  return agendaIssues
+}
+
+module.exports = {
+  fetchAgendaItems
+}

lib/default-template.js

@@ -1,6 +1,6 @@
 'use strict'
 
-module.exports = ({ date, agendaIssues, agendaLabel, meetingNotes, owner, repo, meetingLink }) => {
+module.exports = ({ date, agendaIssues, agendaLabel, meetingNotes, owner, repo, meetingLink, title }) => {
   const timezones = [
     'America/Los_Angeles',
     'America/Denver',
@@ -38,7 +38,7 @@ ${timezones.map((zone) => {
 
 Or in your local time:
 
-* https://www.timeanddate.com/worldclock/?iso=${date.toZonedDateTimeISO('UTC').toPlainDateTime().toString()}
+* https://www.timeanddate.com/worldclock/fixedtime.html?msg=${encodeURIComponent(title)}&iso=${date.toZonedDateTimeISO('UTC').toPlainDateTime().toString().slice(0, 16).replace(/[-:]/g, '')}&p1=1440&ah=1
 
 ## Agenda