BREAKING CHANGES: Merge pull request #500 from Duke-MatSci/develop

BREAKING CHANGES
Duke-MatSci · Jul 28, 2024 · f3d9cb4 · f3d9cb4
2 parents 493babb + aeed7f9
commit f3d9cb4
Show file tree

Hide file tree

Showing 129 changed files with 11,045 additions and 4,188 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,10 +39,14 @@ jobs:
         run: |
           cd resfulservice
           npm install
-      - run: npm install
-      - run: npm run test
+      - name: Run restful service tests
+        run: |
+          cd resfulservice
+          npm run test
         env:
           CI: true
+      - run: npm install
+      # - run: npm run test
   BuildFrontend:
     needs: [test]
     uses: Duke-MatSci/materialsmine/.github/workflows/builder.yml@develop

diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,7 @@ package-lock.json
 **/**/*.log
 
 # Fuseki
+mockDB/old-fuseki/
 mockDB/fuseki/shiro.ini
 mockDB/fuseki/backups/
 mockDB/fuseki/databases/
@@ -38,6 +39,7 @@ mockDB/fuseki/templates/
 mockDB/fuseki/log4j2.properties
 mockDB/materialsmine_backup/
 mockDB/fuseki/files/
+mockDB/fuseki/
 
 #Sync DB
 mockDB/restore/mongodump/