From 0e1a48cd065951d9b4aa1fc7ffd76e1f65718a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samy=20Pess=C3=A9?= Date: Fri, 20 Dec 2024 11:19:54 +0100 Subject: [PATCH] Upgrade bun and setup-bun, switch to text lockfile (#2651) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Greg Bergé --- .bun-version | 1 + .github/composite/setup-bun/action.yaml | 18 ++++++++ .github/workflows/ci.yaml | 54 +++++++++--------------- .github/workflows/publish.yaml | 14 +++--- bun.lockb | Bin 574448 -> 574672 bytes bunfig.toml | 2 +- packages/icons/bin/kit.js | 2 +- packages/icons/package.json | 2 +- 8 files changed, 46 insertions(+), 47 deletions(-) create mode 100644 .bun-version create mode 100644 .github/composite/setup-bun/action.yaml diff --git a/.bun-version b/.bun-version new file mode 100644 index 0000000000..2818446a45 --- /dev/null +++ b/.bun-version @@ -0,0 +1 @@ +1.1.40 diff --git a/.github/composite/setup-bun/action.yaml b/.github/composite/setup-bun/action.yaml new file mode 100644 index 0000000000..62c7848b9c --- /dev/null +++ b/.github/composite/setup-bun/action.yaml @@ -0,0 +1,18 @@ +name: 'Setup Bun' +description: 'Install Bun and cache dependencies' +runs: + using: 'composite' + steps: + # We cache dependencies even if Bun is fast to avoid downloading fontawesome too many times + # and impacting bandwidth there. + - name: Cache bun + uses: actions/cache@v4 + with: + path: ~/.bun/install/cache + key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}-${{ hashFiles('**/bun.lock') }} + restore-keys: | + ${{ runner.os }}-bun- + - name: Setup bun + uses: oven-sh/setup-bun@v2 + with: + bun-version-file: '.bun-version' diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1612f1c077..0387c2c475 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,7 +5,7 @@ on: branches: - main env: - NPMRC_FONT_AWESOME_TOKEN: ${{ secrets.NPMRC_FONT_AWESOME_TOKEN }} + NPM_TOKEN_READONLY: ${{ secrets.NPM_TOKEN_READONLY }} jobs: deploy: name: Deploy to Cloudflare Pages @@ -22,10 +22,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Setup bun - uses: oven-sh/setup-bun@v1 - with: - bun-version: 1.1.18 + - name: Setup Bun + uses: ./.github/composite/setup-bun - name: Install dependencies run: bun install --frozen-lockfile env: @@ -102,10 +100,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Setup bun - uses: oven-sh/setup-bun@v1 - with: - bun-version: 1.1.18 + - name: Setup Bun + uses: ./.github/composite/setup-bun - name: Install dependencies run: bun install --frozen-lockfile - name: Setup Playwright @@ -128,10 +124,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Setup bun - uses: oven-sh/setup-bun@v1 - with: - bun-version: 1.1.18 + - name: Setup Bun + uses: ./.github/composite/setup-bun - name: Install dependencies run: bun install --frozen-lockfile env: @@ -147,10 +141,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Setup bun - uses: oven-sh/setup-bun@v1 - with: - bun-version: 1.1.18 + - name: Setup Bun + uses: ./.github/composite/setup-bun - name: Install dependencies run: bun install --frozen-lockfile env: @@ -162,10 +154,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Setup bun - uses: oven-sh/setup-bun@v1 - with: - bun-version: 1.1.18 + - name: Setup Bun + uses: ./.github/composite/setup-bun - name: Install dependencies run: bun install --frozen-lockfile env: @@ -177,10 +167,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Setup bun - uses: oven-sh/setup-bun@v1 - with: - bun-version: 1.1.18 + - name: Setup Bun + uses: ./.github/composite/setup-bun - name: Install dependencies run: bun install --frozen-lockfile env: @@ -191,16 +179,14 @@ jobs: runs-on: ubuntu-latest name: Build (Open Source) env: - NPMRC_FONT_AWESOME_TOKEN: '' + NPM_TOKEN_READONLY: '' steps: - name: Checkout uses: actions/checkout@v4 - - name: Setup bun - uses: oven-sh/setup-bun@v1 - with: - bun-version: 1.1.18 + - name: Setup Bun + uses: ./.github/composite/setup-bun - name: Install dependencies - run: bun install --frozen-lockfile + run: bun install env: PUPPETEER_SKIP_DOWNLOAD: 1 - run: bun run build @@ -210,10 +196,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Setup bun - uses: oven-sh/setup-bun@v1 - with: - bun-version: 1.1.18 + - name: Setup Bun + uses: ./.github/composite/setup-bun - name: Install dependencies run: bun install --frozen-lockfile env: diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index c232ebd72c..c73ac6cbf1 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -17,10 +17,8 @@ jobs: with: # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits fetch-depth: 0 - - name: Setup bun - uses: oven-sh/setup-bun@v1 - with: - bun-version: 1.1.18 + - name: Setup Bun + uses: ./.github/composite/setup-bun - name: Install dependencies run: bun install --frozen-lockfile env: @@ -34,7 +32,7 @@ jobs: # Using a PAT instead of GITHUB_TOKEN because we need to run workflows when releases are created # https://github.com/orgs/community/discussions/26875#discussioncomment-3253761 GITHUB_TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + NPM_TOKEN_READONLY: ${{ secrets.NPM_TOKEN_READONLY }} CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} release-preview: @@ -45,10 +43,8 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v3 - - name: Setup bun - uses: oven-sh/setup-bun@v1 - with: - bun-version: 1.1.18 + - name: Setup Bun + uses: ./.github/composite/setup-bun - name: Install dependencies run: bun install --frozen-lockfile env: diff --git a/bun.lockb b/bun.lockb index 1b543f8ea330aea3c30ab1f90258494628cab81e..13da417e7ddc5fddb502b70d67483f4884da7204 100755 GIT binary patch delta 33609 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 XU4P%#gmXdEK3{R}M%(T4z4?Ct5dd`$ delta 33558 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 DShcQT diff --git a/bunfig.toml b/bunfig.toml index 88a0a88dd5..1716967668 100644 --- a/bunfig.toml +++ b/bunfig.toml @@ -1,2 +1,2 @@ [install.scopes] -"awesome.me" = { token = "$NPMRC_FONT_AWESOME_TOKEN", url = "https://npm.fontawesome.com/" } +"gitbook" = { token = "$NPM_TOKEN_READONLY", url = "https://registry.npmjs.org" } diff --git a/packages/icons/bin/kit.js b/packages/icons/bin/kit.js index c44409e49d..b565ca9000 100644 --- a/packages/icons/bin/kit.js +++ b/packages/icons/bin/kit.js @@ -11,7 +11,7 @@ export function getKitPath() { try { source = path.resolve( path.dirname( - url.fileURLToPath(import.meta.resolve('@awesome.me/kit-a463935e93/package.json')), + url.fileURLToPath(import.meta.resolve('@gitbook/fontawesome-pro/package.json')), ), 'icons', ); diff --git a/packages/icons/package.json b/packages/icons/package.json index b41d788fc6..7cdf94a4f1 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -22,7 +22,7 @@ "@fortawesome/fontawesome-free": "^6.6.0" }, "optionalDependencies": { - "@awesome.me/kit-a463935e93": "1.0.8" + "@gitbook/fontawesome-pro": "1.0.8" }, "devDependencies": { "typescript": "^5.5.3"