diff --git a/.github/workflows/ci-chromatic.yaml b/.github/workflows/ci-chromatic.yaml index 2c9bcd258..e95c8af49 100644 --- a/.github/workflows/ci-chromatic.yaml +++ b/.github/workflows/ci-chromatic.yaml @@ -15,6 +15,15 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 + ref: "refs/pull/${{ github.event.number }}/merge" + - name: Check for redundant workflow run + run: | + HEAD_SHA=$(git rev-parse HEAD^) + if [ "$HEAD_SHA" != "${{ github.event.pull_request.head.sha }}" ]; then + echo "HEAD SHA and Pull Request HEAD SHA do not match, cancelling run" + echo "GitHub has scheduled a newer workflow run already." + exit 1 + fi - name: Setup Node.js uses: actions/setup-node@v3 with: diff --git a/.github/workflows/ci-docs.yaml b/.github/workflows/ci-docs.yaml index 5c4cf9eef..06f52f7ac 100644 --- a/.github/workflows/ci-docs.yaml +++ b/.github/workflows/ci-docs.yaml @@ -9,6 +9,16 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + with: + ref: "refs/pull/${{ github.event.number }}/merge" + - name: Check for redundant workflow run + run: | + HEAD_SHA=$(git rev-parse HEAD^) + if [ "$HEAD_SHA" != "${{ github.event.pull_request.head.sha }}" ]; then + echo "HEAD SHA and Pull Request HEAD SHA do not match, cancelling run" + echo "GitHub has scheduled a newer workflow run already." + exit 1 + fi - name: Setup Node.js uses: actions/setup-node@v3 with: diff --git a/.github/workflows/ci-front.yaml b/.github/workflows/ci-front.yaml index ec0946734..aad335684 100644 --- a/.github/workflows/ci-front.yaml +++ b/.github/workflows/ci-front.yaml @@ -12,6 +12,16 @@ jobs: REACT_APP_AUTH_URL: http://127.0.0.1:3000/auth steps: - uses: actions/checkout@v3 + with: + ref: "refs/pull/${{ github.event.number }}/merge" + - name: Check for redundant workflow run + run: | + HEAD_SHA=$(git rev-parse HEAD^) + if [ "$HEAD_SHA" != "${{ github.event.pull_request.head.sha }}" ]; then + echo "HEAD SHA and Pull Request HEAD SHA do not match, cancelling run" + echo "GitHub has scheduled a newer workflow run already." + exit 1 + fi - name: Setup Node.js uses: actions/setup-node@v3 with: diff --git a/.github/workflows/ci-server.yaml b/.github/workflows/ci-server.yaml index 6ef78dc14..fb34a93a2 100644 --- a/.github/workflows/ci-server.yaml +++ b/.github/workflows/ci-server.yaml @@ -9,6 +9,16 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + with: + ref: "refs/pull/${{ github.event.number }}/merge" + - name: Check for redundant workflow run + run: | + HEAD_SHA=$(git rev-parse HEAD^) + if [ "$HEAD_SHA" != "${{ github.event.pull_request.head.sha }}" ]; then + echo "HEAD SHA and Pull Request HEAD SHA do not match, cancelling run" + echo "GitHub has scheduled a newer workflow run already." + exit 1 + fi - name: Setup Node.js uses: actions/setup-node@v3 with: diff --git a/front/src/modules/ui/components/buttons/__stories__/Button.stories.tsx b/front/src/modules/ui/components/buttons/__stories__/Button.stories.tsx index f5afbebe8..18aec7712 100644 --- a/front/src/modules/ui/components/buttons/__stories__/Button.stories.tsx +++ b/front/src/modules/ui/components/buttons/__stories__/Button.stories.tsx @@ -1,5 +1,5 @@ import styled from '@emotion/styled'; -import { boolean, select, text, withKnobs } from '@storybook/addon-knobs'; +import { text, withKnobs } from '@storybook/addon-knobs'; import { expect, jest } from '@storybook/jest'; import type { Meta, StoryObj } from '@storybook/react'; import { userEvent, within } from '@storybook/testing-library';