Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into benelan/9255-add-icons…
Browse files Browse the repository at this point in the history
…-to-monorepo

* origin/dev: (206 commits)
  fix(tile): center align slot's text when alignment is equal to center (#9773)
  build: regenerate package lock due to build errors (#9774)
  build(deps): update dependency @floating-ui/dom to v1.6.7 (#9766)
  chore(common-tests): add themed test helper (#9763)
  chore: release next
  fix(shell): update shell to correctly position calcite shell panel at shell's bottom (#9748)
  chore: release next
  fix(tile): center align contentTop and contentBottom slots when alignment prop equals "center" (#9732)
  chore: release next
  chore(tree-item): fix mutable warning `indeterminate` prop (#9760)
  fix(panel, flow-item): fix footer-padding CSS prop regression (#9757)
  build(deps): update angular monorepo to v18 (major) (#9587)
  chore: release next
  Chore: remove component usage files (#9052)
  fix(input-number): restore decimal input mode default (#9741)
  test(panel, flow-item): add scale control to simple stories (#9747)
  chore: release next
  feat(panel, flow-item): add scale property (#9730)
  chore: release next
  fix(segmented-control): Make check state update correctly (#9733)
  ...
  • Loading branch information
benelan committed Jul 15, 2024
2 parents 79e32a2 + 4a26398 commit 03722cb
Show file tree
Hide file tree
Showing 590 changed files with 15,598 additions and 12,374 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/accessibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ body:
id: packages
attributes:
label: Calcite package
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/main/packages) related to the request.
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/dev/packages) related to the request.
options:
- label: "@esri/calcite-components"
- label: "@esri/calcite-components-angular"
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ body:
id: packages
attributes:
label: Calcite package
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/main/packages) related to the request.
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/dev/packages) related to the request.
options:
- label: "@esri/calcite-components"
- label: "@esri/calcite-components-angular"
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ body:
id: packages
attributes:
label: Calcite package
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/main/packages) related to the request.
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/dev/packages) related to the request.
options:
- label: "@esri/calcite-components"
- label: "@esri/calcite-components-angular"
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/refactor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ body:
id: packages
attributes:
label: Calcite package
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/main/packages) related to the request.
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/dev/packages) related to the request.
options:
- label: "@esri/calcite-components"
- label: "@esri/calcite-components-angular"
Expand Down
50 changes: 50 additions & 0 deletions .github/scripts/publishPrerelease.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#!/usr/bin/env bash
set -o errexit

if [ "$BRANCH" = "dev" ] && [ "$NEXT_RELEASE_ENABLED" != "true" ]; then
echo "Next release is disabled"
exit 0
fi

npm install

if [ "$BRANCH" = "dev" ] && ! npm run util:is-next-deployable; then
echo "No deployable changes on dev"
exit 0
fi

git config --global user.email "github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"

# version the packages with lerna before building to ensure the version in
# Calcite components' source code preamble is correct for deployment
if [ "$BRANCH" = "dev" ]; then
npm run version:next
elif [ "$BRANCH" = "rc" ]; then
npm run version:rc
else
echo "Prereleases are only deployable from the 'dev' and 'rc' branches."
exit 1
fi

npm run build
npm test

# try deploying storybook, but still release next if it fails with "|| true"
if [ "$BRANCH" = "dev" ]; then
{ npm run --workspace=@esri/calcite-components build-storybook &&
npx --workspace=@esri/calcite-components storybook-to-ghpages \
--host-token-env-variable=GH_TOKEN_FOR_STORYBOOK \
--existing-output-dir=docs --ci; } || true

# remove the built docs after storybook deploys to gh-pages
git reset --hard
fi

if [ "$BRANCH" = "dev" ]; then
npm run publish:next
elif [ "$BRANCH" = "rc" ]; then
npm run publish:rc
fi

npm run util:push-tags
14 changes: 0 additions & 14 deletions .github/workflows/add-esri-product-label.yml

This file was deleted.

14 changes: 0 additions & 14 deletions .github/workflows/add-package-label.yml

This file was deleted.

14 changes: 0 additions & 14 deletions .github/workflows/add-priority-label.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .github/workflows/assign-for-verification.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Chromatic
on:
push:
branches: [main, hotfix, rc]
branches: [rc, dev]
pull_request:
branches: [main, hotfix, rc]
branches: [rc, dev]
types: [labeled, synchronize]
jobs:
run:
Expand All @@ -20,7 +20,7 @@ jobs:
- run: npm install
- run: npm --workspace="packages/calcite-design-tokens" run build
- name: Publish to Chromatic
uses: chromaui/action@v1
uses: chromaui/action@v11
with:
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
zip: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [main, rc]
branches: [main, rc, dev]
pull_request:
# The branches below must be a subset of the branches above
branches: [main, rc]
branches: [main, rc, dev]
schedule:
- cron: "19 2 * * 4"

Expand Down
56 changes: 44 additions & 12 deletions .github/workflows/deploy-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,68 @@ name: Deploy Latest
on:
workflow_dispatch:
push:
branches: [main, hotfix]
branches: [main]
permissions:
contents: write
pull-requests: write
jobs:
sync-dev-to-main:
if: github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
permissions:
id-token: write
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
ref: main
fetch-depth: 0
token: ${{ secrets.ADMIN_TOKEN }}
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: package.json
- name: Sync dev to main
run: |
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
git rebase --autostash origin/dev
git pull --rebase origin main
npm install
npm run build
npm test
git push origin main
release-please:
runs-on: ubuntu-20.04
if: github.event_name != 'workflow_dispatch'
runs-on: ubuntu-latest
permissions:
id-token: write
steps:
- uses: google-github-actions/release-please-action@v3.7.13
- uses: googleapis/release-please-action@v4
id: release
with:
command: manifest
token: ${{ secrets.ADMIN_TOKEN }}
default-branch: ${{ github.ref_name }}
extra-files: |
packages/calcite-components/readme.md
target-branch: main
- name: Checkout Repository
if: ${{ steps.release.outputs.releases_created }}
if: steps.release.outputs.releases_created == 'true'
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.ADMIN_TOKEN }}
- name: Setup Node
if: ${{ steps.release.outputs.releases_created }}
if: steps.release.outputs.releases_created == 'true'
uses: actions/setup-node@v4
with:
node-version-file: package.json
registry-url: "https://registry.npmjs.org"
- name: Build Packages and Publish to NPM
if: ${{ steps.release.outputs.releases_created }}
if: steps.release.outputs.releases_created == 'true'
env:
RELEASED_PATHS: ${{ toJSON(steps.release.outputs.paths_released) }}
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
NPM_CONFIG_PROVENANCE: true
GH_TOKEN: ${{ secrets.ADMIN_TOKEN }}
run: |
npm install
npm run build
Expand All @@ -41,6 +73,8 @@ jobs:
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
release_commit="$(git rev-parse HEAD)"
# The "|| true" prevents failure if there are no changes
git add packages/calcite-components/src/components.d.ts package-lock.json || true
Expand All @@ -59,5 +93,3 @@ jobs:
npm run publish:latest
npm run util:upload-release-assets -- "${{ steps.release.outputs.paths_released }}"
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
65 changes: 0 additions & 65 deletions .github/workflows/deploy-next.yml

This file was deleted.

45 changes: 45 additions & 0 deletions .github/workflows/deploy-prerelease.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Deploy Prerelease
concurrency:
group: deploy_prerelease
cancel-in-progress: true
on:
# `next` versions are automatically released when deployabled commits are pushed to dev
push:
branches: [dev]
# `rc` versions must be manually released:
# https://docs.github.com/en/actions/using-workflows/manually-running-a-workflow
workflow_dispatch:
jobs:
build:
runs-on: ubuntu-latest
permissions:
id-token: write
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.ADMIN_TOKEN }}
ref: ${{ github.base_ref || github.ref_name }}
- uses: actions/setup-node@v4
with:
node-version-file: package.json
registry-url: "https://registry.npmjs.org"
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Deploy prerelease and storybook
env:
NEXT_RELEASE_ENABLED: ${{ secrets.NEXT_RELEASE_ENABLED }}
# https://github.com/storybookjs/storybook-deployer/issues/77#issuecomment-618560481
GH_TOKEN_FOR_STORYBOOK: ${{ github.actor }}:${{ secrets.ADMIN_TOKEN }}
NPM_CONFIG_PROVENANCE: true
BRANCH: ${{ github.base_ref || github.ref_name }}
run: "${{ github.workspace }}/.github/scripts/publishPrerelease.sh"
- name: notify teams
uses: toko-bifrost/ms-teams-deploy-card@3.1.2
if: ${{ !cancelled() && github.event_name == 'push' }}
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
webhook-uri: ${{ secrets.TEAMS_WEBHOOK_URI_BUILD }}
show-on-start: false
card-layout-exit: complete
timezone: America/Los_Angeles
Loading

0 comments on commit 03722cb

Please sign in to comment.