diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2f124bf..bd909f0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -30,15 +30,15 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.9.8 + rev: v0.15.6 hooks: # Linter - id: ruff - types_or: [python, pyi, jupyter, toml] - args: [--fix, --exit-non-zero-on-fix] + types_or: [python, pyi, jupyter, pyproject] + args: [--fix] # Formatter - id: ruff-format - types_or: [python, pyi, jupyter, toml] + types_or: [python, pyi, jupyter, pyproject] - repo: https://github.com/RobertCraigie/pyright-python rev: v1.1.403 diff --git a/deploy.sh b/deploy.sh index 834a88c..d4f57a2 100755 --- a/deploy.sh +++ b/deploy.sh @@ -17,7 +17,7 @@ cd "$FIREBASE_FUNCTIONS_DIR" cd "$BASE_DIR" -firebase use ${FIREBASE_PROJECT?error} +firebase use "${FIREBASE_PROJECT?error}" firebase target:apply hosting auth "$FIREBASE_AUTH_SITE" @@ -32,6 +32,27 @@ firebase functions:config:set \ osm.client_secret="$OSM_OAUTH_CLIENT_SECRET" \ osm.client_secret_web="$OSM_OAUTH_CLIENT_SECRET_WEB" -firebase deploy --only hosting +SKIP_HOSTING=false +FORCE=false + +for arg in "$@"; do + case $arg in + --skip-hosting) SKIP_HOSTING=true ;; + --force) FORCE=true ;; + esac +done + +# HOSTING +if [ "$SKIP_HOSTING" = false ]; then + firebase deploy --only hosting +fi + +# DATABASE firebase deploy --only database -firebase deploy --only functions + +# FUNCTIONS +FUNCTIONS_CMD="firebase deploy --only functions" +if [ "$FORCE" = true ]; then + FUNCTIONS_CMD="$FUNCTIONS_CMD --force" +fi +eval $FUNCTIONS_CMD