Merge branch 'edge-civictechto' into participation-a11y

CivicTechTO · Oct 18, 2024 · 6f7a5af · 6f7a5af
2 parents c5cfbc4 + f54ca46
commit 6f7a5af
Show file tree

Hide file tree

Showing 18 changed files with 6,722 additions and 14,344 deletions.
diff --git a/.github/workflows/release-docker-images.yml b/.github/workflows/release-docker-images.yml
@@ -5,9 +5,10 @@ on:
   push:
     branches:
       - main
-      - stable
       - edge
-      - dev
+  pull_request:
+    branches:
+      - main
 
 jobs:
   build:
@@ -32,11 +33,16 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.CR_PAT }}
 
       - name: Build full project via docker-compose
-        run: docker compose --profile postgres build --parallel --build-arg GIT_HASH=${GITHUB_SHA:0:6}
+        run: |
+          mv example.env .env
+          sed -i 's/docker.io/ghcr.io/g' docker-compose.yml
+          sed -i 's/compdem/civictechto/g' docker-compose.yml
+          docker compose --profile postgres build --parallel --build-arg GIT_HASH=${GITHUB_SHA:0:6}
 
       - name: Push images to Docker Hub
         run: docker compose --profile postgres push --ignore-push-failures
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 .clj-kondo/
 .env
 .envrc

diff --git a/README.md b/README.md
@@ -7,11 +7,11 @@ For a detailed methods paper, see [Polis: Scaling Deliberation by Mapping High D
    [methods-paper]: https://www.e-revistes.uji.es/index.php/recerca/article/view/5516/6558
 
 <!-- Changes to badge text in URLs below, require changes to "name" value in .github/workflows/*.yml -->
-[![Docker Image Builds](https://github.com/compdemocracy/polis/workflows/Docker%20image%20builds/badge.svg)][docker-image-builds]
-[![E2E Tests](https://github.com/compdemocracy/polis/workflows/E2E%20Tests/badge.svg)][e2e-tests]
+[![Docker Image Builds](https://github.com/CivicTechTO/polis/workflows/Docker%20image%20builds/badge.svg)][docker-image-builds]
+[![E2E Tests](https://github.com/CivicTechTO/polis/workflows/E2E%20Tests/badge.svg)][e2e-tests]
 
-   [docker-image-builds]: https://hub.docker.com/u/compdem
-   [e2e-tests]: https://github.com/compdemocracy/polis/actions?query=workflow%3A%22E2E+Tests%22
+   [docker-image-builds]: https://hub.docker.com/u/newjerseystyle
+   [e2e-tests]: https://github.com/CivicTechTO/polis/actions?query=workflow%3A%22E2E+Tests%22
 
 ---