Cleanup changes

Getting the server changes ready for merge. I modified the yml jobs to run on master again, since this was switched off for testing.  This might trigger a cascade of events, and I think we all the other PRs are ready so we can see if their jobs are triggered too.

.github/workflows/image_build_push.yml

@@ -1,32 +1,21 @@
-# This is a basic workflow to help you get started with Actions
-
 name: docker image
 
-# Controls when the action will run. Triggers the workflow on push or pull request 
-# events but only for the master branch
 on:
   push:
-    # TODO: Change branch to master branch of e-mission-server
-    branches: [ consolidate-differences ]
+    branches: [ master ]
 
-# Env variable
 env:
   DOCKER_USER: ${{secrets.DOCKER_USER}}
   DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   build:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
     outputs:
       date: ${{ steps.date.outputs.date }}
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v2
     - name: docker login
       run: | # log into docker hub account
@@ -71,20 +60,18 @@ jobs:
 
     strategy:
       matrix:
-        # TODO: Change user / organization to emission instead of MukuFlash03
-        repo: ['MukuFlash03/op-admin-dashboard', 'MukuFlash03/em-public-dashboard']
+        repo: ['e-mission/op-admin-dashboard', 'e-mission/em-public-dashboard']
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Trigger workflow in admin-dash, public-dash
       # TODO: Create Fine-grained token with "Actions: write" permissions 
-      # TODO: Change branch name under "ref" in the curl command
       run: |
         curl -L \
           -X POST \
           -H "Accept: application/vnd.github+json" \
           -H "Authorization: Bearer ${{ secrets.GH_FG_PAT_TAGS }}" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
           https://api.github.com/repos/${{ matrix.repo }}/actions/workflows/image_build_push.yml/dispatches \
-          -d '{"ref":"tags-combo-approach", "inputs": {"docker_image_tag" : "${{ env.DOCKER_IMAGE_TAG }}"}}'
+          -d '{"ref":"master", "inputs": {"docker_image_tag" : "${{ env.DOCKER_IMAGE_TAG }}"}}'

.github/workflows/osx-ubuntu-manual-install.yml

@@ -5,12 +5,12 @@ name: osx-ubuntu-manual-install
 on:
   push:
     branches:
-        # - master
-        # - gis-based-mode-detection
+        - master
+        - gis-based-mode-detection
         - consolidate-differences
   pull_request:
     branches:
-        # - master
+        - master
         - gis-based-mode-detection
   schedule:
     # * is a special character in YAML so you have to quote this string

.github/workflows/test-default-action.yml

@@ -7,12 +7,12 @@ name: CI
 on:
   push:
     branches:
-        # - master
-        # - gis-based-mode-detection
+        - master
+        - gis-based-mode-detection
         - consolidate-differences
   pull_request:
     branches:
-        # - master
+        - master
         - gis-based-mode-detection
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel

.github/workflows/test-with-docker.yml

@@ -6,9 +6,9 @@ name: test-with-docker
 # events but only for the master branch
 on:
   push:
-    branches: [ consolidate-differences ]
+    branches: [ master ]
   pull_request:
-    branches: [ consolidate-differences ]
+    branches: [ master ]
   schedule:
     # * is a special character in YAML so you have to quote this string
     - cron:  '5 4 * * 0'

.github/workflows/test-with-manual-install.yml

@@ -7,13 +7,13 @@ name: ubuntu-only-test-with-manual-install
 on:
   push:
     branches: 
-        # - master
-        # - gis-based-mode-detection
+        - master
+        - gis-based-mode-detection
         - consolidate-differences
   pull_request:
     branches: 
-        # - master
-        # - gis-based-mode-detection
+        - master
+        - gis-based-mode-detection
         - consolidate-differences
   schedule:
     # * is a special character in YAML so you have to quote this string

emission/tests/netTests/TestPush.py

@@ -188,7 +188,6 @@ def testFcmNoMapping(self):
 
         # and there will be no entries in the token mapping database
         self.assertEqual(edb.get_push_token_mapping_db().count_documents({}), 0)
-
 
 if __name__ == '__main__':
     import emission.tests.common as etc