Merge branch 'main' into 0o001-patch-1

twbs · Aug 21, 2023 · aa26fa1 · aa26fa1
2 parents b5e35be + ba44960
commit aa26fa1
Show file tree

Hide file tree

Showing 4 changed files with 117 additions and 96 deletions.
diff --git a/.github/workflows/calibreapp-image-actions.yml b/.github/workflows/calibreapp-image-actions.yml
@@ -8,12 +8,18 @@ on:
       - '**.png'
       - '**.webp'
 
+permissions:
+  contents: read
+
 jobs:
   build:
     # Only run on Pull Requests within the same repository, and not from forks.
     if: github.event.pull_request.head.repo.full_name == github.repository
     name: calibreapp/image-actions
     runs-on: ubuntu-latest
+    permissions:
+      # allow calibreapp/image-actions to update PRs
+      pull-requests: write
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3

diff --git a/build/change-version.mjs b/build/change-version.mjs
@@ -6,24 +6,22 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 
+import { execFile } from 'node:child_process'
 import fs from 'node:fs/promises'
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
-import globby from 'globby'
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+import process from 'node:process'
 
 const VERBOSE = process.argv.includes('--verbose')
 const DRY_RUN = process.argv.includes('--dry') || process.argv.includes('--dry-run')
 
-// These are the filetypes we only care about replacing the version
-const GLOB = [
-  '**/*.{css,html,js,json,md,scss,txt,yml}'
+// These are the files we only care about replacing the version
+const FILES = [
+  'README.md',
+  'hugo.yml',
+  'js/src/base-component.js',
+  'package.js',
+  'scss/mixins/_banner.scss',
+  'site/data/docs-versions.yml'
 ]
-const GLOBBY_OPTIONS = {
-  cwd: path.join(__dirname, '..'),
-  gitignore: true
-}
 
 // Blame TC39... https://github.com/benjamingr/RegExp.escape/issues/37
 function regExpQuote(string) {
@@ -54,7 +52,7 @@ async function replaceRecursively(file, oldVersion, newVersion) {
   }
 
   if (VERBOSE) {
-    console.log(`FILE: ${file}`)
+    console.log(`Found ${oldVersion} in ${file}`)
   }
 
   if (DRY_RUN) {
@@ -64,6 +62,19 @@ async function replaceRecursively(file, oldVersion, newVersion) {
   await fs.writeFile(file, newString, 'utf8')
 }
 
+function bumpNpmVersion(newVersion) {
+  if (DRY_RUN) {
+    return
+  }
+
+  execFile('npm', ['version', newVersion, '--no-git-tag'], { shell: true }, error => {
+    if (error) {
+      console.error(error)
+      process.exit(1)
+    }
+  })
+}
+
 function showUsage(args) {
   console.error('USAGE: change-version old_version new_version [--verbose] [--dry[-run]]')
   console.error('Got arguments:', args)
@@ -87,11 +98,11 @@ async function main(args) {
     showUsage(args)
   }
 
-  try {
-    const files = await globby(GLOB, GLOBBY_OPTIONS)
+  bumpNpmVersion(newVersion)
 
+  try {
     await Promise.all(
-      files.map(file => replaceRecursively(file, oldVersion, newVersion))
+      FILES.map(file => replaceRecursively(file, oldVersion, newVersion))
     )
   } catch (error) {
     console.error(error)