From f57236be2e9f6d4287ec0337b183815fea967041 Mon Sep 17 00:00:00 2001 From: kiosion Date: Mon, 14 Oct 2024 01:04:01 -0400 Subject: [PATCH] chore: Bump PNPM vers for workflows --- .github/workflows/netlify-deploy.yml | 4 ++-- .github/workflows/sanity.yml | 20 ++++++++++---------- .github/workflows/svelte.yml | 24 ++++++++++++------------ .github/workflows/test.yml | 12 ++++++------ package.json | 3 +-- 5 files changed, 31 insertions(+), 32 deletions(-) diff --git a/.github/workflows/netlify-deploy.yml b/.github/workflows/netlify-deploy.yml index 1f49d818..ddc11cad 100644 --- a/.github/workflows/netlify-deploy.yml +++ b/.github/workflows/netlify-deploy.yml @@ -18,13 +18,13 @@ jobs: name: Install pnpm id: pnpm-install with: - version: 9.1.0 + version: 9.8.0 run_install: false - name: Use node_modules cache uses: actions/cache@v4 id: nm-cache with: - path: 'svelte-app/node_modules' + path: "svelte-app/node_modules" key: ${{ runner.os }}-npm-${{ hashFiles('svelte-app/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-nm-16- diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml index 6f0f16f7..8ad5d7d7 100644 --- a/.github/workflows/sanity.yml +++ b/.github/workflows/sanity.yml @@ -2,16 +2,16 @@ name: CI - Sanity on: push: - branches: [ "main" ] + branches: ["main"] paths-ignore: - - '**/*.md' - - 'LICENSE' - - '**/.husky' - - 'svelte-app/**' - - 'express-api/**' - - 'elixir-api/**' + - "**/*.md" + - "LICENSE" + - "**/.husky" + - "svelte-app/**" + - "express-api/**" + - "elixir-api/**" -concurrency: +concurrency: group: sanity cancel-in-progress: true @@ -30,13 +30,13 @@ jobs: name: Install pnpm id: pnpm-install with: - version: 9.1.0 + version: 9.8.0 run_install: false - name: Use node_modules cache uses: actions/cache@v4 id: nm-cache with: - path: 'sanity-cms/node_modules' + path: "sanity-cms/node_modules" key: ${{ runner.os }}-npm-${{ hashFiles('sanity-cms/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-npm- diff --git a/.github/workflows/svelte.yml b/.github/workflows/svelte.yml index b12ad5d8..84419f1b 100644 --- a/.github/workflows/svelte.yml +++ b/.github/workflows/svelte.yml @@ -2,17 +2,17 @@ name: CI on: push: - branches: [ "main" ] + branches: ["main"] paths-ignore: - - '**/*.md' - - 'LICENSE' - - '**/.husky' - - 'sanity-cms/**' - - 'express-api/**' - - 'rust-api/**' - - 'elixir-api/**' + - "**/*.md" + - "LICENSE" + - "**/.husky" + - "sanity-cms/**" + - "express-api/**" + - "rust-api/**" + - "elixir-api/**" -concurrency: +concurrency: group: ci cancel-in-progress: true @@ -31,13 +31,13 @@ jobs: name: Install pnpm id: pnpm-install with: - version: 9.1.0 + version: 9.8.0 run_install: false - name: Use node_modules cache uses: actions/cache@v4 id: nm-cache with: - path: 'svelte-app/node_modules' + path: "svelte-app/node_modules" key: ${{ runner.os }}-npm-${{ hashFiles('svelte-app/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-npm- @@ -52,6 +52,6 @@ jobs: secrets: inherit deploy: name: Deploy - needs: [ lint, tests ] + needs: [lint, tests] uses: ./.github/workflows/netlify-deploy.yml secrets: inherit diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1bd1478b..152e7a7c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,10 +2,10 @@ name: Tests on: pull_request: - branches: [ "main" ] + branches: ["main"] workflow_call: -concurrency: +concurrency: group: test-${{ github.ref }} cancel-in-progress: true @@ -23,13 +23,13 @@ jobs: - uses: pnpm/action-setup@v4 name: Install pnpm with: - version: 9.1.0 + version: 9.8.0 run_install: false - name: Use node_modules cache uses: actions/cache@v4 id: nm-cache with: - path: 'svelte-app/node_modules' + path: "svelte-app/node_modules" key: ${{ runner.os }}-npm-${{ hashFiles('svelte-app/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-npm- @@ -52,13 +52,13 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v4 with: - version: 9.1.0 + version: 9.8.0 run_install: false - name: Use node_modules cache uses: actions/cache@v4 id: nm-cache with: - path: 'svelte-app/node_modules' + path: "svelte-app/node_modules" key: ${{ runner.os }}-npm-${{ hashFiles('svelte-app/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-npm- diff --git a/package.json b/package.json index 3102054e..f99e1a65 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,5 @@ }, "scripts": { "prepare": "test -f ./.husky/pre-commit || (husky install && chmod ug+x ./.husky/* && husky add ./.husky/pre-commit 'pnpm lint-staged')" - }, - "packageManager": "pnpm@9.8.0+sha512.8e4c3550fb500e808dbc30bb0ce4dd1eb614e30b1c55245f211591ec2cdf9c611cabd34e1364b42f564bd54b3945ed0f49d61d1bbf2ec9bd74b866fcdc723276" + } }