Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
sneko committed Nov 22, 2023
2 parents 14a7419 + 0c67e17 commit 4909b27
Show file tree
Hide file tree
Showing 8 changed files with 5,988 additions and 271 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,14 @@ jobs:
- name: Build
env:
CRISP_WEBSITE_ID: ${{ secrets.CRISP_WEBSITE_ID }}
run: make build && cat apps/docs/dist/main/stories.json
run: make build

- name: Deploy to Netlify
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
uses: netlify/actions/cli@master
with:
args: deploy --dir=apps/docs/dist --prod
env:
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
run: make deploy

- name: Release package
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
# The branches below must be a subset of the branches above
branches: [main, dev]
schedule:
- cron: '36 7 * * 6'
- cron: '30 9 1 * *' # Once a month, 1st at 9:30

jobs:
analyze:
Expand Down
5 changes: 5 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/apps/docs/dist/
/apps/docs/tmp/
/apps/docs/public/mockServiceWorker.js
/apps/docs-*/stories/framework/
/packages/dsfr-connect/builder-dist/
/packages/dsfr-connect/dist/
/packages/dsfr-connect/src/mastodon-v4/mastodon/
/pnpm-lock.yaml
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ format:

format-check:
pnpm run format:check

deploy:
pnpm run deploy
4 changes: 3 additions & 1 deletion apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"build": "pnpm cli build",
"lint": "pnpm cli lint",
"lint:es": "pnpm cli lint:es",
"lint:ts": "pnpm cli lint:ts"
"lint:ts": "pnpm cli lint:ts",
"deploy": "netlify deploy --filter docs --dir=dist --prod"
},
"devDependencies": {
"@dsfrc/dsfr-connect": "workspace:dsfr-connect@*",
Expand Down Expand Up @@ -55,6 +56,7 @@
"he": "^1.2.0",
"http-server": "^14.1.1",
"jsdom": "^22.0.0",
"netlify-cli": "^17.6.0",
"node-fetch-native": "^1.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"format:check": "prettier --check \"**/*.{js,jsx,ts,tsx,mdx}\"",
"test:unit": "turbo run test:unit",
"test:unit:watch": "turbo run test:unit:watch",
"start": "turbo run start"
"start": "turbo run start",
"deploy": "turbo run deploy"
},
"devDependencies": {
"@trivago/prettier-plugin-sort-imports": "^4.0.0",
Expand Down
Loading

0 comments on commit 4909b27

Please sign in to comment.