Merge branch 'dev' into josh/preps

NaturalHistoryMuseum · Sep 19, 2024 · f54b279 · f54b279
2 parents 72aeeb6 + b1059d8
commit f54b279
Show file tree

Hide file tree

Showing 159 changed files with 10,381 additions and 1,637 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,9 +13,9 @@ jobs:
  uses: actions/checkout@v3
 
  - name: Build images
- run: docker-compose build
+ run: docker compose build
 
  - name: Run tests
  env:
  COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
- run: docker-compose run -e COVERALLS_REPO_TOKEN ckan bash /opt/scripts/run-tests.sh -c ckanext.nhm
+ run: docker compose run -e COVERALLS_REPO_TOKEN ckan bash /opt/scripts/run-tests.sh -c ckanext.nhm
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,6 @@
 .pytest_cache
 .coverage
 build/
-dist/
 .idea
 **/node_modules/
 ckanext/nhm/theme/public/fonts/