Skip to content

Commit

Permalink
Merge pull request #52 from emiliosheinz/dev
Browse files Browse the repository at this point in the history
dev -> main
  • Loading branch information
emiliosheinz authored May 16, 2024
2 parents d167433 + de17ca6 commit 9df7de9
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 20 deletions.
26 changes: 7 additions & 19 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,30 +1,18 @@
# Since the ".env" file is gitignored, you can use the ".env.example" file to
# build a new ".env" file when you clone the repo. Keep this file up-to-date
# when you add new variables to `.env`.

# This file will be committed to version control, so make sure not to have any
# secrets in it. If you are cloning this repo, create a copy of this file named
# ".env" and populate it with your secrets.

# When adding additional environment variables, the schema in "/src/env.js"
# should be updated accordingly.

# Prisma
# https://www.prisma.io/docs/reference/database-reference/connection-urls#env
# URL used by prisma to connect to the Database
DATABASE_URL="postgresql://postgres:password@localhost:5432/sos-pet"

# Next Auth
# You can generate a new secret on the command line with:
# openssl rand -base64 32
# https://next-auth.js.org/configuration/options#secret
# NEXTAUTH_SECRET=""
NEXTAUTH_URL="http://localhost:3000"
NEXTAUTH_SECRET="nextauthsecret"

# Next Auth Google Sign-In
# Next Auth Providers
GOOGLE_CLIENT_ID=""
GOOGLE_CLIENT_SECRET=""

# Postgres only used on Docker
# Google Maps
NEXT_PUBLIC_GOOGLE_MAPS_API_KEY=""

# Docker related variables, not used on Next.js
POSTGRES_DB="sos-pet"
POSTGRES_USER="postgres"
POSTGRES_PASSWORD="password"
2 changes: 1 addition & 1 deletion .github/workflows/lint-type-check-and-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
branches:
- main
- develop
- dev

jobs:
lint-type-check-and-build:
Expand Down
11 changes: 11 additions & 0 deletions scripts/vercel-ignore-build-step.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash

echo "VERCEL_GIT_COMMIT_REF: $VERCEL_GIT_COMMIT_REF"

if [[ "$VERCEL_GIT_COMMIT_REF" == "main" || "$VERCEL_GIT_COMMIT_REF" == "dev" ]] ; then
echo "✅ Build can proceed"
exit 1;
else
echo "🛑 Build cancelled"
exit 0;
fi

0 comments on commit 9df7de9

Please sign in to comment.