Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream

2024-06-30 11:25:40 +02:00
parent 1eb69c5c65 5d4dbbcc67
commit d2aea85e6c
164 changed files with 1857 additions and 1159 deletions
@@ -132,15 +132,17 @@ jobs:
          additional-system-dependencies: ffmpeg libpam-dev

      - name: Load database schema
-        run: './bin/rails db:create db:schema:load db:seed'
+        run: |
+          bin/rails db:setup
+          bin/flatware fan bin/rails db:test:prepare

-      - run: bin/rspec
+      - run: bin/flatware rspec -r ./spec/flatware_helper.rb

      - name: Upload coverage reports to Codecov
        if: matrix.ruby-version == '.ruby-version'
        uses: codecov/codecov-action@v4
        with:
-          files: coverage/lcov/mastodon.lcov
+          files: coverage/lcov/*.lcov
        env:
          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}