Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/github_actions/mydea/action-wa…
Browse files Browse the repository at this point in the history
…it-for-api-2
  • Loading branch information
alimpens authored Nov 1, 2024
2 parents 4a6f855 + 753d91b commit ce543e8
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 13 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/feature-branch-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,18 @@ jobs:
BRANCH_NAME=$(echo $RAW_BRANCH_NAME | sed 's/[^/]*\///')
echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
- name: Check out
- name: Check out branch to access .nvmrc
uses: actions/checkout@v4
with:
ref: gh-pages

- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc

- name: Check out gh-pages branch
uses: actions/checkout@v4
with:
ref: gh-pages

- name: Delete folder
run: |
git config --global user.name GitHub Action
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/feature-branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
with:
node-version-file: .nvmrc

- uses: pnpm/action-setup@v3
- uses: pnpm/action-setup@v4
name: Install pnpm
id: pnpm-install
with:
Expand All @@ -54,11 +54,6 @@ jobs:
run: |
touch ./storybook/dist/${{ github.sha }}.txt
# Our workflows use .nvmrc instead of a fixed version, so we need to copy this file over
# to the dist files for use in the feature branch cleanup workflow
- name: Copy over .nvmrc to dist
run: cp .nvmrc ./storybook/dist/

- name: Pushing to pages branch
uses: JamesIves/github-pages-deploy-action@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
node-version-file: .nvmrc

- name: Install pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
id: pnpm-install
with:
run_install: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
if: ${{ steps.release.outputs.releases_created == 'true' }}

- name: Install pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
id: pnpm-install
with:
run_install: false
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:

# The logic below handles the Storybook deploy:
- name: "Restore build artifact: Storybook"
uses: dawidd6/action-download-artifact@v3
uses: dawidd6/action-download-artifact@v6
with:
workflow: "lint-test.yml"
name: storybook
Expand Down
2 changes: 1 addition & 1 deletion packages/css/src/components/dialog/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ A Dialog allows the user to focus on one task or a piece of information by poppi
- Use dialogs sparingly because they interrupt the user’s workflow.
- Use a dialog for short and non-frequent tasks.
Consider using the main flow for regular tasks.
- Wrap multiple buttons in an [Action Group](https://designsystem.amsterdam/?path=/docs/components-buttons-action-group--docs).
- Wrap multiple buttons in an [Action Group](https://designsystem.amsterdam/?path=/docs/components-layout-action-group--docs).

## Keyboard support

Expand Down

0 comments on commit ce543e8

Please sign in to comment.