testing

gatsbyjs · Aug 25, 2021 · 6f86ce1 · 6f86ce1
1 parent 46b15b7
commit 6f86ce1
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 105 deletions.
diff --git a/packages/gatsby-plugin-image/CHANGELOG.md b/packages/gatsby-plugin-image/CHANGELOG.md
@@ -3,21 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.12.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-image@1.12.0/packages/gatsby-plugin-image) (2021-08-18)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.12)
-
-#### Bug Fixes
-
-- only log missing plugin error in development [#32335](https://github.com/gatsbyjs/gatsby/issues/32335) ([4483ff4](https://github.com/gatsbyjs/gatsby/commit/4483ff44de77fb516fa368ad41f3cf8232c2c294))
-
-#### Chores
-
-- Fix typo Fix [#32784](https://github.com/gatsbyjs/gatsby/issues/32784) ([4550c28](https://github.com/gatsbyjs/gatsby/commit/4550c28fa3e2ee8b0965cdcff5f8b784e2afe082))
-- update formatting & linting [#32626](https://github.com/gatsbyjs/gatsby/issues/32626) ([4a765b5](https://github.com/gatsbyjs/gatsby/commit/4a765b5c62208d58f0bd7fd59558160c0b9feed3))
-- update fs-extra [#32570](https://github.com/gatsbyjs/gatsby/issues/32570) ([bc3410b](https://github.com/gatsbyjs/gatsby/commit/bc3410bff0c31be8e4aba5ce45fd49d93d25118f))
-- update babel monorepo [#32564](https://github.com/gatsbyjs/gatsby/issues/32564) ([a554998](https://github.com/gatsbyjs/gatsby/commit/a554998b4f6765103b650813cf52dbfcc575fecf))
-
 ## [1.11.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-image@1.11.0/packages/gatsby-plugin-image) (2021-08-04)
 
 [🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.11)

diff --git a/packages/gatsby-plugin-mdx/CHANGELOG.md b/packages/gatsby-plugin-mdx/CHANGELOG.md
@@ -3,15 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [2.12.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-mdx@2.12.0/packages/gatsby-plugin-mdx) (2021-08-18)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.12)
-
-#### Chores
-
-- update formatting & linting [#32626](https://github.com/gatsbyjs/gatsby/issues/32626) ([4a765b5](https://github.com/gatsbyjs/gatsby/commit/4a765b5c62208d58f0bd7fd59558160c0b9feed3))
-- update babel monorepo [#32564](https://github.com/gatsbyjs/gatsby/issues/32564) ([a554998](https://github.com/gatsbyjs/gatsby/commit/a554998b4f6765103b650813cf52dbfcc575fecf))
-
 ## [2.11.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-plugin-mdx@2.11.0/packages/gatsby-plugin-mdx) (2021-08-04)
 
 [🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.11)

diff --git a/packages/gatsby-source-wordpress/CHANGELOG.md b/packages/gatsby-source-wordpress/CHANGELOG.md
@@ -3,34 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [5.12.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-source-wordpress@5.12.0/packages/gatsby-source-wordpress) (2021-08-18)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.12)
-
-#### Features
-
-- process multiple manifest ids on a preview action [#32723](https://github.com/gatsbyjs/gatsby/issues/32723) ([627039a](https://github.com/gatsbyjs/gatsby/commit/627039ac7c3e156f75ec9aea739fd1720a732541))
-- generate webp images [#30896](https://github.com/gatsbyjs/gatsby/issues/30896) ([fcd0b44](https://github.com/gatsbyjs/gatsby/commit/fcd0b449edcca4808814fbcd89df82551d566889))
-
-#### Bug Fixes
-
-- not all stored nodes are media items - protect against that [#32752](https://github.com/gatsbyjs/gatsby/issues/32752) ([cf9c051](https://github.com/gatsbyjs/gatsby/commit/cf9c051dc52811b92a4ba60683ed6d51a448c093))
-- ensure all file links are rewritten [#32679](https://github.com/gatsbyjs/gatsby/issues/32679) [#31652](https://github.com/gatsbyjs/gatsby/issues/31652) fixes [#31646](https://github.com/gatsbyjs/gatsby/issues/31646) ([32722f0](https://github.com/gatsbyjs/gatsby/commit/32722f07691d654d19f21bf5bc54f4a6d75b5d88))
-- linting error [#32749](https://github.com/gatsbyjs/gatsby/issues/32749) ([2e15bfa](https://github.com/gatsbyjs/gatsby/commit/2e15bfaf3dcb28b4939260cf3795bba3f477fdc6))
-- update dependency chalk to ^4.1.2 [#32576](https://github.com/gatsbyjs/gatsby/issues/32576) ([5c4e109](https://github.com/gatsbyjs/gatsby/commit/5c4e109313cd1b59f814332fdb4dfdcaf1faed1a))
-
-#### Chores
-
-- update formatting & linting [#32626](https://github.com/gatsbyjs/gatsby/issues/32626) ([4a765b5](https://github.com/gatsbyjs/gatsby/commit/4a765b5c62208d58f0bd7fd59558160c0b9feed3))
-- update fs-extra [#32570](https://github.com/gatsbyjs/gatsby/issues/32570) ([bc3410b](https://github.com/gatsbyjs/gatsby/commit/bc3410bff0c31be8e4aba5ce45fd49d93d25118f))
-- move to deprecated plugins [#31654](https://github.com/gatsbyjs/gatsby/issues/31654) ([6d6a70c](https://github.com/gatsbyjs/gatsby/commit/6d6a70c279a3628270fb47b8c836ef579e072967))
-- update [dev] minor and patch dependencies for gatsby-source-wordpress [#32563](https://github.com/gatsbyjs/gatsby/issues/32563) ([1b60d2f](https://github.com/gatsbyjs/gatsby/commit/1b60d2f06359cf089eb499a15fedf77f365d206a))
-- update babel monorepo [#32564](https://github.com/gatsbyjs/gatsby/issues/32564) ([a554998](https://github.com/gatsbyjs/gatsby/commit/a554998b4f6765103b650813cf52dbfcc575fecf))
-
-#### Other Changes
-
-- :construction: Check that node is not falsey [#32488](https://github.com/gatsbyjs/gatsby/issues/32488) ([59a6287](https://github.com/gatsbyjs/gatsby/commit/59a6287a11eb5b136e3e681e7d1d1c08d169b601))
-
 ## [5.11.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-source-wordpress@5.11.0/packages/gatsby-source-wordpress) (2021-08-04)
 
 [🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.11)

diff --git a/packages/gatsby/CHANGELOG.md b/packages/gatsby/CHANGELOG.md
@@ -3,44 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [3.12.0](https://github.com/gatsbyjs/gatsby/commits/gatsby@3.12.0/packages/gatsby) (2021-08-18)
-
-[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v3.12)
-
-#### Features
-
-- Opt in 20% of users to webpack dev server caching [#32829](https://github.com/gatsbyjs/gatsby/issues/32829) [#32839](https://github.com/gatsbyjs/gatsby/issues/32839) ([a0e2a77](https://github.com/gatsbyjs/gatsby/commit/a0e2a77f07731bac63bb8b8a07a30ab422ed7c53))
-- measure how long GraphQL takes to run in createPages and warn if > 10s [#32751](https://github.com/gatsbyjs/gatsby/issues/32751) ([8bd7cf0](https://github.com/gatsbyjs/gatsby/commit/8bd7cf06a0f0bea14c376b8c0daca8856baf6db6))
-- add env flag to disable lazy function compilation in develop [#32707](https://github.com/gatsbyjs/gatsby/issues/32707) ([ed04979](https://github.com/gatsbyjs/gatsby/commit/ed04979ed66219ed9f5f07a5b859f07217d32393))
-- write node manifests to public dir instead of .cache [#32547](https://github.com/gatsbyjs/gatsby/issues/32547) ([9c41b7a](https://github.com/gatsbyjs/gatsby/commit/9c41b7a90e97d971049dd9b5d296a37ca8912fa8))
-- allow sites to disable the dev 404 page [#32686](https://github.com/gatsbyjs/gatsby/issues/32686) ([af5525e](https://github.com/gatsbyjs/gatsby/commit/af5525e59cbc8052ccac1c646ef12a0c5d9843bf))
-
-#### Bug Fixes
-
-- reduce parse cost writing page-data [#32763](https://github.com/gatsbyjs/gatsby/issues/32763) ([b97782f](https://github.com/gatsbyjs/gatsby/commit/b97782f35c92a2c51fdd5c997a0ac3fe45cf2524))
-- Wrap performance mark in check [#32778](https://github.com/gatsbyjs/gatsby/issues/32778) ([365d00b](https://github.com/gatsbyjs/gatsby/commit/365d00b2ee413ef38f56ba4262304865ecd4256e))
-- fix "Couldn't find temp query result for X." errors when using LMDB_STORE fix [#32757](https://github.com/gatsbyjs/gatsby/issues/32757) ([d5715c6](https://github.com/gatsbyjs/gatsby/commit/d5715c63c8c638ad58d78ea394f683e5fc7b93ef))
-- fix incorrect filtering with experimental LMDB indexes fix [#32728](https://github.com/gatsbyjs/gatsby/issues/32728) ([9b456cd](https://github.com/gatsbyjs/gatsby/commit/9b456cd1d9fdf8096d12fd367e679d815e08b6cf))
-- Silence process.send Error [#32744](https://github.com/gatsbyjs/gatsby/issues/32744) ([5d7831d](https://github.com/gatsbyjs/gatsby/commit/5d7831d949b3352b7bb39718072b75102707ad99))
-- Worker support in fast-refresh-module [#32432](https://github.com/gatsbyjs/gatsby/issues/32432) ([6daead6](https://github.com/gatsbyjs/gatsby/commit/6daead63ce02c21690a48cdd531fdb2761628703))
-- fix node manifest processing in inc builds fix [#32538](https://github.com/gatsbyjs/gatsby/issues/32538) ([1577f9b](https://github.com/gatsbyjs/gatsby/commit/1577f9b0ab9909cdc4dfe0acca2dbbae89418ad5))
-- update dependency eslint-webpack-plugin to ^2.5.4 [#32583](https://github.com/gatsbyjs/gatsby/issues/32583) ([170e58b](https://github.com/gatsbyjs/gatsby/commit/170e58b1ea30e3ee9927e9ef61be9c0c629b9534))
-- update dependency mini-css-extract-plugin to v1.6.2 [#32586](https://github.com/gatsbyjs/gatsby/issues/32586) ([6c6d4e5](https://github.com/gatsbyjs/gatsby/commit/6c6d4e501764614ad737c88ba5810b6fbbcbff68))
-- update dependency eslint to ^7.32.0 [#32628](https://github.com/gatsbyjs/gatsby/issues/32628) ([65fe945](https://github.com/gatsbyjs/gatsby/commit/65fe94547e0892b3978a7c7376ff1297acb0144f))
-- clarify redirectInBrowser option [#32669](https://github.com/gatsbyjs/gatsby/issues/32669) ([774e680](https://github.com/gatsbyjs/gatsby/commit/774e680e186f3ac0928a7b178d395d64b7d8a4e9))
-- update dependency eslint-plugin-import to ^2.23.4 [#32581](https://github.com/gatsbyjs/gatsby/issues/32581) ([769e98f](https://github.com/gatsbyjs/gatsby/commit/769e98f3dbcdbededfa1909d86aad83050a291c7))
-- update dependency eslint-plugin-react to ^7.24.0 [#32582](https://github.com/gatsbyjs/gatsby/issues/32582) ([de676bc](https://github.com/gatsbyjs/gatsby/commit/de676bc45d4196c78bf88e91346625ef80e93545))
-- update dependency eslint-plugin-flowtype to ^5.8.2 [#32629](https://github.com/gatsbyjs/gatsby/issues/32629) ([4391f05](https://github.com/gatsbyjs/gatsby/commit/4391f05bcae65c36820c3407f09df668dacc692e))
-- update dependency chalk to ^4.1.2 [#32576](https://github.com/gatsbyjs/gatsby/issues/32576) ([5c4e109](https://github.com/gatsbyjs/gatsby/commit/5c4e109313cd1b59f814332fdb4dfdcaf1faed1a))
-- load page and static queries texts in PQR only once per worker [#32545](https://github.com/gatsbyjs/gatsby/issues/32545) ([bbec42b](https://github.com/gatsbyjs/gatsby/commit/bbec42bd599dfbed4c7a4728f50b3c9fba5f903c))
-
-#### Chores
-
-- Improved getSavedScrollPosition API desc [#32765](https://github.com/gatsbyjs/gatsby/issues/32765) ([7de2769](https://github.com/gatsbyjs/gatsby/commit/7de27693890ea19466911a663dc4f8ca47b879f4))
-- update formatting & linting [#32626](https://github.com/gatsbyjs/gatsby/issues/32626) ([4a765b5](https://github.com/gatsbyjs/gatsby/commit/4a765b5c62208d58f0bd7fd59558160c0b9feed3))
-- fix typo in string enum member fix [#32721](https://github.com/gatsbyjs/gatsby/issues/32721) ([2502250](https://github.com/gatsbyjs/gatsby/commit/2502250a4849053085286f9abceff59f78c662dd))
-- update babel monorepo [#32564](https://github.com/gatsbyjs/gatsby/issues/32564) ([a554998](https://github.com/gatsbyjs/gatsby/commit/a554998b4f6765103b650813cf52dbfcc575fecf))
-
 ### [3.11.1](https://github.com/gatsbyjs/gatsby/commits/gatsby@3.11.1/packages/gatsby) (2021-08-09)
 
 #### Features

diff --git a/scripts/gatsby-changelog-generator/update-and-open-pr.js b/scripts/gatsby-changelog-generator/update-and-open-pr.js
@@ -1,13 +1,30 @@
 const execa = require(`execa`)
+const { Octokit } = require(`@octokit/rest`)
 const { getAllPackageNames, updateChangelog } = require(`./generate`)
 
 if (!process.env.GITHUB_ACCESS_TOKEN) {
   throw new Error(`GITHUB_ACCESS_TOKEN env var not set`)
 }
 
 async function run() {
-  await execa(`git`, [`checkout`, `master`])
-  await execa(`git`, [`pull`, `--tags`])
+  // Always use the same branch
+  const base = `vladar/generate-changelogs`
+  const branchName = `bot-changelog-update`
+
+  try {
+    await execa(`git`, [`branch`, `-D`, branchName])
+    // eslint-disable-next-line no-empty
+  } catch (e) {}
+
+  await execa(`git`, [`fetch`, `--tags`, `origin`])
+
+  try {
+    // Try to create a branch from the existing remote as a starting point
+    await execa(`git`, [`checkout`, `-B`, branchName, `origin/${branchName}`])
+  } catch (e) {
+    await execa(`git`, [`checkout`, `-b`, branchName])
+  }
+  await execa(`git`, [`merge`, `origin/${base}`])
 
   const updatedPackages = []
   for (const pkg of getAllPackageNames()) {
@@ -26,24 +43,31 @@ async function run() {
     return
   }
 
-  // Commit to the same branch
-  const branchName = `bot-changelog-update`
   const commitMessage = `DO NOT MERGE: testing`
-  try {
-    await execa(`git`, [`checkout`, `-b`, branchName, `origin/${branchName}`])
-  } catch {
-    await execa(`git`, [`checkout`, branchName])
-  }
+  const updatedChangelogs = updatedPackages.map(
+    pkg => `packages/${pkg}/CHANGELOG.md`
+  )
+  await execa(`git`, [`add`, ...updatedChangelogs])
   await execa(`git`, [`commit`, `-m`, commitMessage])
+  await execa(`git`, [`push`, `-u`, `origin`, branchName])
+
+  const octokit = new Octokit({
+    auth: `token ${process.env.GITHUB_ACCESS_TOKEN}`,
+  })
 
   try {
+    const owner = `gatsbyjs`
+    const repo = `gatsby`
+
+    // Note: PR may already exist for this branch.
+    // Then it will throw but we don't care too much
     const pr = await octokit.pulls.create({
-      owner: `gatsby`,
-      repo: `gatsbyjs`,
+      owner,
+      repo,
       title: commitMessage,
       head: branchName,
-      base: `master`,
-      body: `Update changelogs of the following packages:\n\n${updatedPackages
+      base: base,
+      body: `Updated changelogs of the following packages:\n\n${updatedPackages
         .map(p => `- ${p}`)
         .join(`\n`)}`,
     })
@@ -54,9 +78,11 @@ async function run() {
       owner,
       repo,
       issue_number: pr.data.number,
-      labels: [`bot: merge on green`],
+      labels: [`type: maintenance`],
     })
   } catch (e) {
-    console.log(e)
+    console.error(e)
   }
 }
+
+run()