Skip to content

Commit

Permalink
Merge branch 'main' into renovate/update/tailwindcss-3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
HeartSquared authored Dec 3, 2024
2 parents 57a7bfa + 23eca3f commit c2298c8
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 19 deletions.
5 changes: 5 additions & 0 deletions .changeset/sharp-beers-give.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@kaizen/components": patch
---

Update translations
1 change: 1 addition & 0 deletions .github/workflows/canary-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
jobs:
release:
runs-on: ubuntu-latest
timeout-minutes: 10
env:
GITHUB_TOKEN: ${{ github.token }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
Expand Down
19 changes: 3 additions & 16 deletions .github/workflows/changeset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
jobs:
version:
runs-on: ubuntu-latest
timeout-minutes: 10
outputs:
hasChangesets: ${{ steps.changesets.outputs.hasChangesets }}
hasPublished: ${{ steps.changesets.outputs.published }}
Expand All @@ -28,24 +29,10 @@ jobs:
commit: "version packages"
version: pnpm ci:version
publish: pnpm ci:publish
# deployment:
# runs-on: ubuntu-latest
# needs: version
# permissions:
# deployments: write
# steps:
# - uses: actions/checkout@v4
# - uses: ./.github/actions/setup
# - uses: chrnorm/deployment-action@v2
# name: Create GitHub deployment
# id: deployment
# with:
# token: "$GITHUB_TOKEN"
# environment-url: http://cultureamp.design
# environment: production
# description: ${{ needs.version.outputs.publishedPackages }}

notify-slack:
runs-on: ubuntu-latest
timeout-minutes: 5
needs:
version
# We only trigger this flow if the publish is happening, inferred by not having a changeset.
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/check-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
changesets-exists:
if: github.head_ref != 'changeset-release/main'
runs-on: ubuntu-latest
timeout-minutes: 10
timeout-minutes: 5
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -32,6 +32,7 @@ jobs:
verify-build:
if: github.head_ref != 'changeset-release/main'
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/chromatic-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
jobs:
update-baseline:
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/chromatic-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@ jobs:
name: Check if we should run Chromatic tests
if: github.head_ref != 'changeset-release/main' && github.event.pull_request.draft == false
runs-on: ubuntu-latest
timeout-minutes: 3
steps:
- run: echo "Run the Chromatic tests"

chromatic:
needs: run-check
runs-on: ubuntu-latest
timeout-minutes: 10
outputs:
storybookUrl: ${{ steps.publishChromatic.outputs.storybookUrl }}
steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/clear-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ permissions:
jobs:
clear-cache:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- name: Clear cache
uses: actions/github-script@v7
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
jobs:
deployment:
runs-on: ubuntu-latest
timeout-minutes: 10
permissions:
deployments: write
steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-stories.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
build-test-storybook:
if: github.head_ref != 'changeset-release/main'
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions packages/components/locales/mi.json
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@
},
"kzGenericTile.infoButtonLabel" : {
"description" : "Prompts user to interact with button to reveal more information",
"message" : "View more information:"
"message" : "Tirohia etahi atu korero:"
},
"kzGenericTile.infoButtonReturnLabel" : {
"description" : "Prompts user to interact with button to hide information",
"message" : "Hide information:"
"message" : "Huna mōhiohio:"
},
"splitButton.dropdownButton.label" : {
"description" : "Label for a dropdown menu holding additional actions",
Expand Down

0 comments on commit c2298c8

Please sign in to comment.