Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into t1
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/plasma-asdk/package-lock.json
#	packages/plasma-asdk/package.json
#	packages/plasma-b2c/api/plasma-b2c.api.md
#	packages/plasma-b2c/package-lock.json
#	packages/plasma-b2c/package.json
#	packages/plasma-new-hope/package-lock.json
#	packages/plasma-new-hope/package.json
#	packages/plasma-new-hope/src/components/Typography/Typography.types.ts
#	packages/plasma-web/api/plasma-web.api.md
#	packages/plasma-web/package-lock.json
#	packages/plasma-web/package.json
#	utils/plasma-docs-ui/package.json
#	website/plasma-temple-docs/package.json
#	website/plasma-theme-builder/package.json
#	website/plasma-ui-docs/package.json
#	website/plasma-web-docs/package.json
#	website/plasma-website/package.json
  • Loading branch information
Yakutoc committed Jan 18, 2024
2 parents 0c027bd + 8568c9d commit 22dec3a
Show file tree
Hide file tree
Showing 3,177 changed files with 36,728 additions and 12,607 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions .github/changelog-builder-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
"title": "## Docs",
"labels": ["plasma-docs"]
},
{
"title": "## Bugs",
"labels": ["plasma-bugs"]
},
{
"title": "## Misc",
"labels": []
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/publish-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
with:
ref: refs/pull/${{github.event.pull_request.number}}/merge
upload_assets: ${{ needs.scope.outputs.HAS_ASSETS == 'true' }}
auto-options: '--no-changelog'
secrets:
gh_token: ${{ secrets.GH_TOKEN }}
npm_registry_token: ${{ secrets.NPM_REGISTRY_TOKEN }}
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/publish-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
upload_assets:
type: boolean
default: false
auto-options:
type: string
description: "@auto-it cli arguments for example --no-changelog"
default: ''
secrets:
gh_token:
required: true
Expand Down Expand Up @@ -61,7 +65,7 @@ jobs:
run: npm whoami && npx lerna info && npx auto info || echo 'auto info returned 1'

- name: Create Release
run: upload_assets="${{ inputs.upload_assets }}" npm run release
run: upload_assets="${{ inputs.upload_assets }}" npm run release -- ${{ inputs.auto-options }}

- name: Update package-lock files
if: ${{ inputs.with-update-package-lock }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/publish-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ jobs:
with-update-package-lock: true
commit-message: "Update package-lock.json files"
upload_assets: ${{ needs.change-state.outputs.HAS_ASSETS == 'true' }}
auto-options: '--no-changelog'
secrets:
gh_token: ${{ secrets.GH_TOKEN }}
npm_registry_token: ${{ secrets.NPM_REGISTRY_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Create "changelog_artifacts.md"
run: |
cat > ${{ github.workspace }}/changelog_artifacts.md << EOL
${{ steps.github_release.outputs.changelog }}
`${{ steps.github_release.outputs.changelog }}`
EOL
- name: Upload "changelog_artifacts.md"
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/required-primary-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
show-progress: false

- name: Prepare environment
uses: ./.github/actions/prepare-environment
Expand All @@ -41,15 +42,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
show-progress: false

- name: Prepare environment
uses: ./.github/actions/prepare-environment

- name: Lerna bootstrap
run: npx lerna bootstrap --since=$(git merge-base --fork-point origin/dev) --ignore=${{env.LERNA_IGNORE_LIST}}
run: npx lerna bootstrap --ignore=${{env.LERNA_IGNORE_LIST}}

- name: Unit tests
run: npm run test
Expand All @@ -62,7 +64,7 @@ jobs:
npm i --no-progress --no-audit react@17 react-dom@17 @types/[email protected] @types/react-dom@17 --prefix="./packages/plasma-web"
- name: Lerna bootstrap by scope
run: npx lerna bootstrap --scope=@salutejs/plasma-{ui,web,b2c,temple,hope,new-hope,core}
run: npx lerna bootstrap --scope=@salutejs/plasma-{ui,web,b2c,temple,hope,new-hope,core,icons}

- name: Unit tests for React 17
run: npm run test -- --scope=@salutejs/plasma-{ui,web,b2c,temple}
12 changes: 9 additions & 3 deletions .github/workflows/typescript-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ jobs:
# INFO: Игнорируем пакеты связанные с plasma-tokens, документацией и утилитами, т.к. в них не запускается typescript-coverage
LERNA_IGNORE_LIST: "@salutejs/plasma-{tokens*,temple-docs,ui-docs,docs-ui,web-docs,website,theme-builder,cy-utils,sb-utils}"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: ./.github/actions/prepare-environment
show-progress: false

- name: Prepare environment
uses: ./.github/actions/prepare-environment

- name: Computed scope
id: scope
Expand All @@ -50,6 +52,10 @@ jobs:
enumeration.push('plasma-core')
}
if (!enumeration.includes('plasma-icons')) {
enumeration.push('plasma-icons')
}
return enumeration.join(',');
- name: Lerna bootstrap
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Diff not rendered.
Loading

0 comments on commit 22dec3a

Please sign in to comment.