diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index c2872c9..e46b127 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -28,7 +28,7 @@ jobs: if: needs.test-and-lint.outputs.code-changed == 'true' uses: ./.github/workflows/reusable-deploy-vercel.yml with: - environment: Development + environment: Develop vercel-environment: preview ref: ${{ github.ref }} prebuilt: true diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index a8f5ade..8e3badb 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -57,11 +57,11 @@ jobs: run: | SOURCE_BRANCH="${{ github.head_ref }}" echo "Source branch: $SOURCE_BRANCH" - if [[ "$SOURCE_BRANCH" != release/* ]]; then - echo "::error::Pull Request from branch '$SOURCE_BRANCH' cannot be merged into 'main'. Only branches starting with 'release/' are allowed." + if [[ "$SOURCE_BRANCH" != release/* && "$SOURCE_BRANCH" != hotfix/* ]]; then + echo "::error::Pull Request from branch '$SOURCE_BRANCH' cannot be merged into 'main'. Only branches starting with 'release/' or 'hotfix/' are allowed." exit 1 else - echo "Source branch '$SOURCE_BRANCH' is a valid release branch." + echo "Source branch '$SOURCE_BRANCH' is a valid release or hotfix branch." fi update-pr-comment: diff --git a/src/components/FlyingSanta.tsx b/src/components/FlyingSanta.tsx index e8b9d6f..c2951e1 100644 --- a/src/components/FlyingSanta.tsx +++ b/src/components/FlyingSanta.tsx @@ -262,7 +262,10 @@ const FlyingSanta = () => { zIndex: 9999, }} > - +