Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	bun.lockb
  • Loading branch information
CaptainHPY committed May 16, 2024
2 parents 786caca + 3371ed5 commit 20d42d3
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 32 deletions.
23 changes: 8 additions & 15 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: ⬇️ Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: 🤌 Setup pnpm
uses: pnpm/action-setup@v2
with:
version: 8

- name: ⎔ Setup node
uses: actions/setup-node@v3
with:
node-version: 20
cache: 'pnpm'
- name: 🤌 Setup Bun
uses: oven-sh/setup-bun@v1

- name: 📥 Download deps
run: pnpm install --frozen-lockfile
run: bun install --frozen-lockfile

- name: 🔬 Lint
run: pnpm run lint:strict
run: bun run lint:strict

- name: 🔎 Type check
run: pnpm run typecheck
run: bun run typecheck

- name: 💅 Prettier check
run: pnpm run format:check
run: bun run format:check
continue-on-error: true
28 changes: 14 additions & 14 deletions .github/workflows/purge-cache.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
name: Purge Cache
#name: Purge Cache
# on: [deployment_status]

concurrency:
group: ${{ github.job }}-${{ github.ref }}
cancel-in-progress: true
#concurrency:
# group: ${{ github.job }}-${{ github.ref }}
# cancel-in-progress: true

jobs:
purge-everything:
if: ${{ github.event.deployment_status.state == 'success' && github.event.deployment_status.environment == 'Production' }}
runs-on: ubuntu-latest
steps:
- name: Purge cache
uses: jakejarvis/cloudflare-purge-action@master
env:
CLOUDFLARE_ZONE: ${{ secrets.CLOUDFLARE_ZONE }}
CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
#jobs:
# purge-everything:
# if: ${{ github.event.deployment_status.state == 'success' && github.event.deployment_status.environment == 'Production' }}
# runs-on: ubuntu-latest
# steps:
# - name: Purge cache
# uses: jakejarvis/cloudflare-purge-action@master
# env:
# CLOUDFLARE_ZONE: ${{ secrets.CLOUDFLARE_ZONE }}
# CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
2 changes: 1 addition & 1 deletion .husky/post-merge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

pnpm install
bun install
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ yarn-error.log*
# changelog
CHANGELOG.md

pnpm-lock.yaml
bun.lockb

README.md
Binary file modified bun.lockb
Binary file not shown.
1 change: 1 addition & 0 deletions commitlint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ module.exports = {
'perf',
'revert',
'vercel',
'lint'
],
],
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "next build",
"start": "next start",
"lint": "next lint",
"lint:fix": "eslint src --fix && pnpm format",
"lint:fix": "eslint src --fix && bun format",
"lint:strict": "eslint --max-warnings=0 src",
"typecheck": "tsc --noEmit --incremental false",
"format": "prettier -w .",
Expand Down

0 comments on commit 20d42d3

Please sign in to comment.