Skip to content

Commit

Permalink
Merge branch 'main' into fix/prettier-peer-dep
Browse files Browse the repository at this point in the history
  • Loading branch information
ggazzo authored Sep 27, 2024
2 parents 8a72ba6 + 53e928d commit eae50fb
Show file tree
Hide file tree
Showing 902 changed files with 21,831 additions and 40,028 deletions.
46 changes: 20 additions & 26 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,12 @@ jobs:
outputs:
branch-name: ${{ steps.set-branch-name.outputs.branch-name }}
steps:
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "14.21.3"
- uses: actions/checkout@v2
- name: Turbo Cache
id: turbo-cache
uses: actions/cache@v2
with:
path: .turbo
key: turbo-${{ runner.os }}-${{ github.job }}
restore-keys: |
turbo-${{ runner.os }}-
- uses: actions/cache@v2
node-version: "22.2.0"
cache: "yarn"
- uses: actions/cache@v3
id: yarn-cache
with:
path: |
Expand All @@ -40,15 +33,15 @@ jobs:
if: steps.yarn-cache.outputs.cache-hit != 'true'
- run: yarn run ci
- run: yarn run docs
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: storybooks
path: |
packages/fuselage/storybook-static
packages/onboarding-ui/storybook-static
packages/layout/storybook-static
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: docs
path: |
Expand All @@ -57,7 +50,7 @@ jobs:
ref='${{ github.ref }}'
echo "::set-output name=branch-name::$(echo "${ref:11}")"
id: set-branch-name
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: build
path: packages/**/dist/*
Expand All @@ -68,22 +61,23 @@ jobs:
needs:
- build-and-test
steps:
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: "14.21.3"
node-version: "22.2.0"
registry-url: "https://registry.npmjs.org"
scope: "@rocket.chat"
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/cache@v2
cache: "yarn"
- uses: actions/cache@v3
id: yarn-cache
with:
path: |
**/node_modules
.yarn/cache
key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: build
path: packages
Expand Down Expand Up @@ -117,17 +111,17 @@ jobs:
- build-and-test
environment:
name: github-pages
url: "https://rocketchat.github.io/Rocket.Chat.Fuselage/fuselage/${{ needs.build-and-test.outputs.branch-name }}"
url: "https://rocketchat.github.io/fuselage/fuselage/${{ needs.build-and-test.outputs.branch-name }}"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: gh-pages
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: storybooks
path: packages

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
with:
name: docs
path: .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr-opened.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
name: storybooks
path: packages
- run: |
rm -rf "fuselage/${{ needs.download-artifact.outputs.pr-number }}" "layout/${{ needs.download-artifact.outputs.pr-number }}" "uikit-playground/${{ needs.download-artifact.outputs.pr-number }}" "fuselage-ui-kit/${{ needs.download-artifact.outputs.pr-number }}" "onboarding-ui/${{ needs.download-artifact.outputs.pr-number }}"
rm -rf "fuselage/${{ needs.download-artifact.outputs.pr-number }}" "layout/${{ needs.download-artifact.outputs.pr-number }}" "uikit-playground/${{ needs.download-artifact.outputs.pr-number }}" "onboarding-ui/${{ needs.download-artifact.outputs.pr-number }}"
mv -v packages/fuselage/storybook-static "fuselage/${{ needs.download-artifact.outputs.pr-number }}"
mv -v packages/onboarding-ui/storybook-static "onboarding-ui/${{ needs.download-artifact.outputs.pr-number }}"
mv -v packages/layout/storybook-static "layout/${{ needs.download-artifact.outputs.pr-number }}"
Expand Down
17 changes: 11 additions & 6 deletions .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ on:
- reopened
- synchronize

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

jobs:
build-and-test:
name: Build and Test
Expand All @@ -15,11 +19,12 @@ jobs:
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
runs-on: ubuntu-latest
steps:
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
with:
node-version: "14.21.3"
- uses: actions/checkout@v2
- uses: actions/cache@v2
node-version: "22.2.0"
cache: "yarn"
- uses: actions/cache@v3
id: yarn-cache
with:
path: |
Expand All @@ -28,7 +33,7 @@ jobs:
key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
- name: Turbo Cache
id: turbo-cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: .turbo
key: turbo-${{ runner.os }}-${{ github.job }}
Expand All @@ -37,7 +42,7 @@ jobs:
- run: yarn install
if: steps.yarn-cache.outputs.cache-hit != 'true'
- run: yarn run ci
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
name: "storybooks-${{ github.event.number }}"
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-title.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "Pull request title"
on:
pull_request:
pull_request_target:
types: [opened, edited]

jobs:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
!/.yarn/sdks
!/.yarn/versions
/.pnp.*
/lerna-debug.log
/static
node_modules/
storybook-static/
Expand Down
1 change: 0 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
. "$(dirname "$0")/_/husky.sh"

yarn update-readme
yarn lint-staged --allow-empty
5 changes: 0 additions & 5 deletions .lintstagedrc.json

This file was deleted.

8 changes: 0 additions & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,12 @@
"javascriptreact",
"typescript",
"typescriptreact",
"markdown",
"mdx",
"pegjs"
],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"editor.formatOnSave": true,
"[typescript]": {
"editor.formatOnSave": false
},
"[typescriptreact]": {
"editor.formatOnSave": false
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[pegjs]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
Expand Down

This file was deleted.

Loading

0 comments on commit eae50fb

Please sign in to comment.