diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 917e1c685a..49b15c9c04 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,6 +10,7 @@ concurrency: cancel-in-progress: false env: + pnpm_config_dangerously_allow_all_builds: true SKIP_INSTALL_SIMPLE_GIT_HOOKS: true jobs: @@ -31,7 +32,7 @@ jobs: with: version: latest - name: Install - run: pnpm install --dangerously-allow-all-builds + run: pnpm install - name: Contributors run: | git config --global user.email ${{ secrets.GIT_EMAIL }} @@ -66,7 +67,7 @@ jobs: with: version: latest - name: Install - run: pnpm install --dangerously-allow-all-builds + run: pnpm install - name: Lint run: pnpm lint @@ -93,7 +94,7 @@ jobs: with: version: latest - name: Install - run: pnpm install --dangerously-allow-all-builds + run: pnpm install - name: Install GL runtime # libgl1-mesa-dri ships on the ubuntu-24.04 runner; only install (and # refresh the index) on the off chance a future image drops it. @@ -154,7 +155,7 @@ jobs: with: version: latest - name: Install - run: pnpm install --dangerously-allow-all-builds + run: pnpm install - name: Sync master run: | git config --global user.email ${{ secrets.GIT_EMAIL }} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 9857399789..f5b418aa87 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -8,6 +8,9 @@ on: branches: - master +env: + pnpm_config_dangerously_allow_all_builds: true + jobs: matrix: if: github.ref != 'refs/heads/master' @@ -39,7 +42,7 @@ jobs: with: version: latest - name: Install - run: pnpm install --dangerously-allow-all-builds + run: pnpm install - name: Install GL runtime # libgl1-mesa-dri ships on the ubuntu-24.04 runner; only install (and # refresh the index) on the off chance a future image drops it. diff --git a/packages/goto/package.json b/packages/goto/package.json index c45b51ba16..6f5776bea7 100644 --- a/packages/goto/package.json +++ b/packages/goto/package.json @@ -33,8 +33,8 @@ "@browserless/devices": "workspace:*", "@duckduckgo/autoconsent": "~16.39.0", "@ghostery/adblocker-puppeteer": "~2.18.0", + "@kikobeats/got": "~11.8.8", "debug-logfmt": "~1.4.10", - "got": "~11.8.6", "is-url-http": "~2.3.13", "p-reflect": "~2.1.0", "p-timeout": "~4.1.0", diff --git a/packages/goto/scripts/postinstall.js b/packages/goto/scripts/postinstall.js index 160b35bee9..b19c1acaa3 100644 --- a/packages/goto/scripts/postinstall.js +++ b/packages/goto/scripts/postinstall.js @@ -2,7 +2,7 @@ const { PuppeteerBlocker } = require('@ghostery/adblocker-puppeteer') const { promisify } = require('util') -const got = require('got') +const got = require('@kikobeats/got') const fs = require('fs') const writeFile = promisify(fs.writeFile) diff --git a/packages/screenshot/package.json b/packages/screenshot/package.json index 2e033abe45..29ee6b5382 100644 --- a/packages/screenshot/package.json +++ b/packages/screenshot/package.json @@ -35,10 +35,10 @@ "@browserless/errors": "workspace:*", "@browserless/goto": "workspace:*", "@kikobeats/content-type": "~1.0.4", + "@kikobeats/got": "~11.8.8", "@kikobeats/time-span": "~1.0.13", "automad-prism-themes": "~0.3.8", "debug-logfmt": "~1.4.15", - "got": "~11.8.6", "is-html-content": "~1.0.0", "is-url-http": "~2.3.13", "lodash": "~4.18.1", diff --git a/packages/screenshot/src/overlay/index.js b/packages/screenshot/src/overlay/index.js index b657932f6f..c34d78990c 100644 --- a/packages/screenshot/src/overlay/index.js +++ b/packages/screenshot/src/overlay/index.js @@ -4,7 +4,7 @@ const svgGradient = require('svg-gradient') const isHttpUrl = require('is-url-http') const sharp = require('sharp') const path = require('path') -const got = require('got') +const got = require('@kikobeats/got') const toPx = str => `${str}px`