Merge branch 'main' into panel-selector-bug

NEU-DSG · Dec 5, 2024 · dc1d4e0 · dc1d4e0
2 parents 032b812 + 10b4dcd
commit dc1d4e0
Show file tree

Hide file tree

Showing 101 changed files with 4,848 additions and 4,156 deletions.
diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit
@@ -8,7 +8,7 @@ git-staged() {
 }
 
 # Require sqlx data to be generated when a SQL query is modified.
-if git-staged "types/queries/**.sql" && ! git-staged "sqlx-data.json"; then
+if git-staged "types/queries/**.sql" && ! git-staged "types/.sqlx/**.json"; then
     printf "\nDatabase queries changed without generating sqlx types.\nPlease run 'dev-check' or 'dev-generate-types'.\n"
     HOOKS_FAILED=1
 fi
@@ -26,7 +26,7 @@ if git-staged "website/src/graphql/**.graphql" && ! git-staged "website/src/grap
 fi
 
 # Reqire frontend formatting
-if git-staged "website/*" && cd website && ! yarn prettier -c --config package.json src; then
+if git-staged "website/*" && cd website && yarn prettier -c --config package.json src; then
     printf "Frontend code edited but not formatted.\nPlease run 'dev-check' \nor\n'cd website; prettier -w --config package.json src'.\n"
     HOOKS_FAILED=1
 fi

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -129,7 +129,7 @@ jobs:
           export DATABASE_URL=postgres://dailp:$DATABASE_PASSWORD@localhost:5432/dailp
           nix run --impure .#migrate-schema
           export CF_URL=$(nix run --impure .#tf-output cloudfront_distro_url)
-          nix run --impure .#migrate-data
+          # nix run --impure .#migrate-data
       - name: Publish website
         run: |
           curl -X POST -d {} "$(nix run --impure .#tf-output amplify_webhook)" -H "Content-Type:application/json"