ngageoint
diff --git a/‎.github/workflows/aws_dev.deploy.yaml‎
Lines changed: 12 additions & 8 deletions b/‎.github/workflows/aws_dev.deploy.yaml‎
Lines changed: 12 additions & 8 deletions
diff --git a/‎.github/workflows/build_test.arcgis.service.yaml‎
Lines changed: 9 additions & 9 deletions b/‎.github/workflows/build_test.arcgis.service.yaml‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎.github/workflows/build_test.arcgis.web-app.yaml‎
Lines changed: 2 additions & 4 deletions b/‎.github/workflows/build_test.arcgis.web-app.yaml‎
Lines changed: 2 additions & 4 deletions
diff --git a/‎.github/workflows/build_test.image.service.yaml‎
Lines changed: 21 additions & 8 deletions b/‎.github/workflows/build_test.image.service.yaml‎
Lines changed: 21 additions & 8 deletions
diff --git a/‎.github/workflows/build_test.nga-msi.yaml‎
Lines changed: 17 additions & 8 deletions b/‎.github/workflows/build_test.nga-msi.yaml‎
Lines changed: 17 additions & 8 deletions
diff --git a/‎.github/workflows/build_test.service.yaml‎
Lines changed: 11 additions & 10 deletions b/‎.github/workflows/build_test.service.yaml‎
Lines changed: 11 additions & 10 deletions
@@ -3,8 +3,8 @@ name: AWS Dev Deployment
 on:
   push:
     branches:
-      - develop
-      - test
+      - "**"
+  workflow_dispatch:
 
 permissions:
   id-token: write
@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
-      
+
       - name: Set IMAGE_TAG
         run: |
           if [[ "${{ github.ref_name }}" == "test" ]]; then
@@ -31,22 +31,26 @@ jobs:
           role-to-assume: ${{ secrets.AWS_DEV_ROLE }}
           role-session-name: GithubNGAGeointSession
           aws-region: ${{ secrets.AWS_DEV_REGION }}
-      
+
       - name: AWS ECR Login
         id: ecr-login
         uses: aws-actions/amazon-ecr-login@v2
 
-      - name: Build Docker image and push
+      - name: Build Docker image
         env:
           REGISTRY: ${{ steps.ecr-login.outputs.registry }}
           REPOSITORY: "/mage/server"
           IMAGE_TAG: ${{ env.IMAGE_TAG }}
         run: |
           docker build -t $REGISTRY$REPOSITORY:$IMAGE_TAG .
-          docker push $REGISTRY$REPOSITORY:$IMAGE_TAG
 
-      - name: ReDeploy ECS Service
+      - name: Push Image and ReDeploy ECS Service
+        if: github.ref =='refs/heads/test' || github.ref =='refs/heads/develop'
         env:
           SERVICE: "mage${{ env.IMAGE_TAG }}"
+          REGISTRY: ${{ steps.ecr-login.outputs.registry }}
+          REPOSITORY: "/mage/server"
+          IMAGE_TAG: ${{ env.IMAGE_TAG }}
         run: |
-          aws ecs update-service --cluster magedev --service $SERVICE --force-new-deployment
+          docker push $REGISTRY$REPOSITORY:$IMAGE_TAG
+          aws ecs update-service --cluster magedev --service $SERVICE --force-new-deployment
@@ -3,20 +3,19 @@ name: test and package arcgis service plugin
 on:
   workflow_dispatch:
   workflow_call:
-  push:
+  pull_request:
     paths:
       - .github/workflows/build_test.arcgis.service.yaml
       - .github/workflows/config.yaml
       - plugins/arcgis/service/**
 
 jobs:
-
   config:
     uses: ./.github/workflows/config.yaml
 
   test:
     name: test plugin arcgis.service
-    needs: [ config ]
+    needs: [config]
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -34,12 +33,12 @@ jobs:
       - name: test with node ${{ matrix.node }}
         run: |
           cd plugins/arcgis/service
-          npm ci
+          npm ci --force
           npm test
 
   package:
     name: package plugin arcgis.service
-    needs: [ config, test ]
+    needs: [config, test]
     runs-on: ubuntu-latest
     steps:
       - name: checkout
@@ -51,15 +50,16 @@ jobs:
           cache: npm
           cache-dependency-path: |
             plugins/arcgis/service/package-lock.json
-      - name: build
+      - name: build service for plugin
         run: |
           cd plugins/arcgis/service
-          npm ci
+          npm ci --force
           npm run build
-      - name: pack
+          npm ci --production --force
+      - name: package for plugin
         run: npm pack ./plugins/arcgis/service
       - name: upload package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: arcgis.service-artifacts
           path: |
 
@@ -3,14 +3,13 @@ name: test and package arcgis web plugin
 on:
   workflow_dispatch:
   workflow_call:
-  push:
+  pull_request:
     paths:
       - .github/workflows/build_test.arcgis.web-app.yaml
       - .github/workflows/config.yaml
       - plugins/arcgis/web-app/**
 
 jobs:
-
   config:
     uses: ./.github/workflows/config.yaml
 
@@ -42,9 +41,8 @@ jobs:
         run: |
           npm pack ./plugins/arcgis/web-app/dist/main
       - name: upload packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: arcgis.web-app-artifacts
           path: |
             ngageoint-mage.arcgis.web-app-*.tgz
-
@@ -3,20 +3,19 @@ name: test and package image service plugin
 on:
   workflow_dispatch:
   workflow_call:
-  push:
+  pull_request:
     paths:
       - .github/workflows/build_test.image.service.yaml
       - .github/workflows/config.yaml
       - plugins/image/service/**
 
 jobs:
-
   config:
     uses: ./.github/workflows/config.yaml
 
   test:
     name: test plugin image.service
-    needs: [ config ]
+    needs: [config]
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -31,15 +30,22 @@ jobs:
           cache: npm
           cache-dependency-path: |
             plugins/image/service/package-lock.json
+      - name: build mage service
+        run: |
+          cd service
+          npm ci --force
+          npm run build
       - name: test with node ${{ matrix.node }}
         run: |
           cd plugins/image/service
-          npm ci
+          npm ci --force
+          npm install --os=linux --cpu=x64 sharp
+          rm -rf node_modules/mongoose
           npm test
 
   package:
     name: package plugin image.service
-    needs: [ config, test ]
+    needs: [config, test]
     runs-on: ubuntu-latest
     steps:
       - name: checkout
@@ -51,15 +57,22 @@ jobs:
           cache: npm
           cache-dependency-path: |
             plugins/image/service/package-lock.json
-      - name: build
+      - name: build mage service
         run: |
-          cd plugins/image/service
+          cd service
           npm ci
           npm run build
+      - name: build image service
+        run: |
+          cd plugins/image/service
+          npm ci --force
+          npm install --os=linux --cpu=x64 sharp
+          rm -rf node_modules/mongoose
+          npm run build
       - name: pack
         run: npm pack ./plugins/image/service
       - name: upload package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: image.service-artifacts
           path: |
 
@@ -3,20 +3,19 @@ name: test and package nga-msi plugin
 on:
   workflow_dispatch:
   workflow_call:
-  push:
+  pull_request:
     paths:
       - .github/workflows/build_test.nga-msi.yaml
       - .github/workflows/config.yaml
       - plugins/nga-msi/**
 
 jobs:
-
   config:
     uses: ./.github/workflows/config.yaml
 
   test:
     name: test plugin nga-msi
-    needs: [ config ]
+    needs: [config]
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -31,15 +30,20 @@ jobs:
           cache: npm
           cache-dependency-path: |
             plugins/nga-msi/package-lock.json
+      - name: build mage service
+        run: |
+          cd service
+          npm ci
+          npm run build
       - name: test with node ${{ matrix.node }}
         run: |
           cd plugins/nga-msi
-          npm ci
+          npm ci --force
           npm test
 
   package:
     name: package plugin nga-msi
-    needs: [ config, test ]
+    needs: [config, test]
     runs-on: ubuntu-latest
     steps:
       - name: checkout
@@ -51,16 +55,21 @@ jobs:
           cache: npm
           cache-dependency-path: |
             plugins/nga-msi/package-lock.json
+      - name: build mage service
+        run: |
+          cd service
+          npm ci
+          npm run build
       - name: build
         run: |
           cd plugins/nga-msi
-          npm ci
+          npm ci --force
           npm run build
       - name: pack
         run: npm pack ./plugins/nga-msi
       - name: upload package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: nga-msi-artifacts
           path: |
-            ngageoint-mage.*.tgz
+            ngageoint-mage.*.tgz
@@ -3,7 +3,7 @@ name: build and test service
 on:
   workflow_dispatch:
   workflow_call:
-  push:
+  pull_request:
     paths:
       - .github/workflows/build_test.service.yaml
       - .github/workflows/config.yaml
@@ -15,7 +15,7 @@ jobs:
   build:
     name: build mage service
     needs: config
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: install system libs
         run: |
@@ -28,24 +28,25 @@ jobs:
           node-version: ${{ needs.config.outputs.node_versions-lts }}
           cache: npm
           cache-dependency-path: service/npm-shrinkwrap.json
-      - name: build
+      - name: build and test
         run: |
           cd service
           npm ci
-          npm run build
+          npm test
+          npm ci --production
       - name: package
         run: npm pack ./service
       - name: upload package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mage.service-artifacts
           path: |
             ngageoint-mage.service-*.tgz
 
   test:
     name: test mage service
-    needs: [ config, build ]
-    runs-on: ubuntu-latest
+    needs: [config, build]
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         node: ${{ fromJSON(needs.config.outputs.node_versions-all-json) }}
@@ -62,9 +63,9 @@ jobs:
       - name: install service dependencies
         run: |
           cd service
-          npm ci service
+          npm ci
       - name: download service package
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mage.service-artifacts
       - name: extract service lib
@@ -76,4 +77,4 @@ jobs:
         run: |
           cd service
           npm run ci:test
-      # TODO: restore coveralls test coverage report - see buildAndTest.yml
+      # TODO: restore coveralls test coverage report - see buildAndTest.yml