From ce15006c138c9ed0ae8ad5aff5df87b169c70f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morel=20Se=CC=81bastien?= Date: Tue, 2 Jul 2024 11:09:22 +0200 Subject: [PATCH] improve a bit the CI --- .github/workflows/gh-pages-preview.yaml | 51 ------------------------- .github/workflows/gh-pages.yaml | 6 +-- .ignore | 1 - .vscode/settings.json | 42 +++++++++++++++++++- 4 files changed, 44 insertions(+), 56 deletions(-) delete mode 100644 .github/workflows/gh-pages-preview.yaml delete mode 100644 .ignore diff --git a/.github/workflows/gh-pages-preview.yaml b/.github/workflows/gh-pages-preview.yaml deleted file mode 100644 index 7f343316..00000000 --- a/.github/workflows/gh-pages-preview.yaml +++ /dev/null @@ -1,51 +0,0 @@ -name: GitHub Pages Preview - -on: - pull_request: - types: [opened, synchronize] - -jobs: - deploy: - name: Deploy Preview branch on Github.io - runs-on: ubuntu-latest - concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - steps: - - name: ⬇️ Checkout repo - uses: actions/checkout@v4 - - - name: ⎔ Setup node - uses: actions/setup-node@v4 - with: - node-version: 20 - - - name: Get branch name - id: branch-name - uses: tj-actions/branch-names@v5.4 - - - name: Set .homepage in package.json - uses: jossef/action-set-json-field@v2 - with: - file: apps/demo/package.json - field: homepage - value: libraries/${{ steps.branch-name.outputs.current_branch }} - - - name: 🥖 Build the React App - env: - REACT_APP_BASENAME: libraries/${{ steps.branch-name.outputs.current_branch }} - run: | - yarn - yarn build --filter demo - - - name: 🍿 Deploy - uses: peaceiris/actions-gh-pages@v3.7.3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./apps/demo/build - destination_dir: ./${{ steps.branch-name.outputs.current_branch }} - - - name: Link to preview build in PR - uses: marocchino/sticky-pull-request-comment@v2 - with: - message: | - Preview app available at diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml index 3c44496c..8fa08af4 100644 --- a/.github/workflows/gh-pages.yaml +++ b/.github/workflows/gh-pages.yaml @@ -33,13 +33,13 @@ jobs: - name: 🥖 Build the React App run: | - yarn - yarn build --filter demo + pnpm install + pnpm build --filter @crystallize/demo-app - name: 🍿 Deploy uses: peaceiris/actions-gh-pages@v3 if: ${{ github.ref == 'refs/heads/main' }} with: github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./apps/demo/build + publish_dir: ./apps/demo/dist keep_files: true diff --git a/.ignore b/.ignore deleted file mode 100644 index 3c3629e6..00000000 --- a/.ignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/.vscode/settings.json b/.vscode/settings.json index 614a1506..a513a49e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,45 @@ "editor.detectIndentation": false, "editor.tabSize": 4, "editor.formatOnSave": true, - "editor.formatOnPaste": true + "editor.formatOnPaste": true, + "typescript.suggest.paths": true, + "files.exclude": { + "**/.git": true, + "**/.svn": true, + "**/.hg": true, + "**/CVS": true, + "**/.DS_Store": true, + "**/Thumbs.db": true, + "**/node_modules": true, + "**/build": true, + "**/dist": true, + "**/.turbo": true, + "**/.cache": true + }, + "files.associations": {}, + "todo-tree.general.tags": ["@todo:", "@fixme:", "@bug:"], + "todo-tree.general.statusBar": "top three", + "todo-tree.tree.groupedByTag": true, + "todo-tree.general.statusBarClickBehaviour": "reveal", + "todo-tree.general.tagGroups": { + "TODOs": ["@todo:"], + "BUGs": ["@fixme:", "@bug:"] + }, + "todo-tree.highlights.customHighlight": { + "TODOs": { + "icon": "flame", + "foreground": "#ff9900" + }, + "BUGs": { + "icon": "bug", + "foreground": "#ff0000" + } + }, + "favorites.resources": [ + { + "filePath": "domain", + "group": "Default" + } + ], + "favorites.sortOrder": "ASC" }