Merge branch 'master' into archive-migrations

NZOI · Jan 5, 2024 · 95957e4 · 95957e4
2 parents cc47c61 + 57b299d
commit 95957e4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,6 +48,9 @@ jobs:
           ISOLATE_CGROUPS: false
           ISOLATE_BRANCH: master
 
+      - name: Back up db/schema.rb # it will be overwritten when install.bash runs migrate.bash; back up the original so we can check if it's up to date
+        run: cp db/schema.rb db/schema.rb.git
+
       - run: AUTOCONFIRM=true script/install.bash
         env:
           PGHOST: localhost
@@ -57,6 +60,11 @@ jobs:
       #- run: bundle exec rake db:test:load # not required because script/install.bash runs db:migrate
       - run: bundle exec rspec
 
+      - name: Check that db/schema.rb is up to date
+        run: |
+          diff -u db/schema.rb.git db/schema.rb >&2 ||
+            { echo "Error: db/schema.rb is out of date" >&2; exit 1; }
+
       - uses: coverallsapp/github-action@v2
 
   lint:

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -49,7 +49,7 @@
   config.i18n.fallbacks = true
 
   # Send deprecation notices to registered listeners
-  config.active_support.deprecation = :notify
+  config.active_support.deprecation = :log
 
   # Compress JavaScript and CSS  
   config.assets.compress = true