ci: remove all refs to frontend-map or ui-map

hotosm · Sep 20, 2023 · 1010e20 · 1010e20
1 parent 6a554b4
commit 1010e20
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 38 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -65,12 +65,10 @@ jobs:
         env:
           API_VERSION: ${{ needs.extract-versions.outputs.api_version }}
           FRONTEND_MAIN_VERSION: ${{ needs.extract-versions.outputs.frontend_main_version }}
-          FRONTEND_MAP_VERSION: ${{ needs.extract-versions.outputs.frontend_map_version }}
         run: |
           echo "${{ secrets.DOTENV }}" > .env
           echo "API_VERSION=${API_VERSION}" >> .env
           echo "FRONTEND_MAIN_VERSION=${FRONTEND_MAIN_VERSION}" >> .env
-          echo "FRONTEND_MAP_VERSION=${FRONTEND_MAP_VERSION}" >> .env
 
       - name: Backend smoke test
         run: |
@@ -107,12 +105,10 @@ jobs:
         env:
           API_VERSION: ${{ needs.extract-versions.outputs.api_version }}
           FRONTEND_MAIN_VERSION: ${{ needs.extract-versions.outputs.frontend_main_version }}
-          FRONTEND_MAP_VERSION: ${{ needs.extract-versions.outputs.frontend_map_version }}
         run: |
           echo "${{ secrets.DOTENV }}" > .env
           echo "API_VERSION=${API_VERSION}" >> .env
           echo "FRONTEND_MAIN_VERSION=${FRONTEND_MAIN_VERSION}" >> .env
-          echo "FRONTEND_MAP_VERSION=${FRONTEND_MAP_VERSION}" >> .env
 
       - uses: webfactory/[email protected]
         with:

diff --git a/.github/workflows/r-build_frontend.yml b/.github/workflows/r-build_frontend.yml
@@ -52,4 +52,3 @@ jobs:
             APP_VERSION=${{ inputs.app_version }}
             API_URL=${{ vars.URL_SCHEME }}://${{ vars.API_URL }}
             FRONTEND_MAIN_URL=${{ vars.URL_SCHEME }}://${{ vars.FRONTEND_MAIN_URL }}
-            FRONTEND_MAP_URL=${{ vars.URL_SCHEME }}://${{ vars.FRONTEND_MAP_URL }}
diff --git a/.github/workflows/r-extract_versions.yml b/.github/workflows/r-extract_versions.yml
@@ -9,17 +9,13 @@ on:
       frontend_main_version:
         description: "Frontend Main Version"
         value: ${{ jobs.extract-versions.outputs.frontend_main_version }}
-      frontend_map_version:
-        description: "Frontend Map Version"
-        value: ${{ jobs.extract-versions.outputs.frontend_map_version }}
 
 jobs:
   extract-versions:
     runs-on: ubuntu-latest
     outputs:
       api_version: ${{ steps.extract_api_version.outputs.api_version }}
-      frontend_main_version: ${{ steps.extract_frontend_versions.outputs.frontend_main_version }}
-      frontend_map_version: ${{ steps.extract_frontend_versions.outputs.frontend_map_version }}
+      frontend_main_version: ${{ steps.extract_frontend_version.outputs.frontend_main_version }}
 
     steps:
       - name: Checkout repository
@@ -33,10 +29,8 @@ jobs:
           echo "api_version=${API_VERSION}" >> $GITHUB_OUTPUT
 
       - name: Extract frontend versions
-        id: extract_frontend_versions
+        id: extract_frontend_version
         run: |
           cd src/frontend
           FRONTEND_MAIN_VERSION=$(jq -r '.version' main/package.json)
-          FRONTEND_MAP_VERSION=$(jq -r '.version' fmtm_openlayer_map/package.json)
           echo "frontend_main_version=${FRONTEND_MAIN_VERSION}" >> $GITHUB_OUTPUT
-          echo "frontend_map_version=${FRONTEND_MAP_VERSION}" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/r-frontend_tests.yml b/.github/workflows/r-frontend_tests.yml
@@ -22,7 +22,6 @@ jobs:
         with:
           path: |
             src/frontend/main/node_modules
-            src/frontend/fmtm_openlayer_map/node_modules
           keys: node-modules-${{ env.cache_id }}
           restore-keys: |
             node-modules-

diff --git a/docker-compose.noodk.yml b/docker-compose.noodk.yml
@@ -90,27 +90,3 @@ services:
     networks:
       - fmtm-dev
     restart: unless-stopped
-
-  ui-map:
-    image: "ghcr.io/hotosm/fmtm/frontend/map:debug"
-    build:
-      context: src/frontend
-      dockerfile: debug.dockerfile
-      args:
-        APP_NAME: fmtm_openlayer_map
-        API_URL: ${URL_SCHEME}://${API_URL}
-        FRONTEND_MAIN_URL: ${URL_SCHEME}://${FRONTEND_MAIN_URL}
-    container_name: fmtm_map
-    depends_on:
-      - api
-    volumes:
-      - ./src/frontend/fmtm_openlayer_map:/app
-      - /app/node_modules/
-    environment:
-      - API_URL=${URL_SCHEME}://${API_URL}
-      - FRONTEND_MAIN_URL=${URL_SCHEME}://${FRONTEND_MAIN_URL}
-    ports:
-      - "8082:8082"
-    networks:
-      - fmtm-dev
-    restart: unless-stopped