Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/UTDNebula/jupiter into J…
Browse files Browse the repository at this point in the history
…UP-63-Create-Joined-clubs-carousel
  • Loading branch information
ishaanthenerd committed Oct 15, 2024
2 parents 2537f31 + 0c485c3 commit 03d9eda
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/generateCheck.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
if [ $status == 'success' ]; then
files=$(npx prettier . -l)
status=$?
if [ $status == 0 ]; then
echo "## Formatting Check passed 🥳" >>$GITHUB_STEP_SUMMARY
echo "All files are formatted correctly" >>$GITHUB_STEP_SUMMARY
exit 0
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/prettierCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,5 @@ jobs:
cache: 'npm'
- name: Run npm install
run: npm ci
- name: Run prettier
id: prettier
continue-on-error: true
run: |
files=`npx prettier . -l`
echo files=$files >> "$GITHUB_ENV"
- name: generate errors/summary
- name: Run prettier & generate problems
run: .github/workflows/generateCheck.sh
env:
status: ${{ steps.prettier.outcome }}
2 changes: 1 addition & 1 deletion src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { TRPCReactProvider } from '@src/trpc/react';
import Sidebar from '@src/components/nav/Sidebar';
import { type Metadata } from 'next';

import { GoogleAnalytics } from '@next/third-parties/google'
import { GoogleAnalytics } from '@next/third-parties/google';

const inter = Inter({
subsets: ['latin'],
Expand Down

0 comments on commit 03d9eda

Please sign in to comment.