Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 4 additions & 1 deletion src/components/FlyingSanta.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,10 @@ const FlyingSanta = () => {
zIndex: 9999,
}}
>
<Canvas camera={{ position: [0, 0, 8], fov: 45 }}>
<Canvas
camera={{ position: [0, 0, 8], fov: 45 }}
style={{ pointerEvents: "none" }}
>
<ambientLight intensity={1.5} />
<directionalLight position={[10, 10, 10]} intensity={2} />
<pointLight position={[-10, -10, -10]} intensity={0.5} />
Expand Down