fix more action stuff

ngageoint · Feb 25, 2025 · 5b13a32 · 5b13a32
1 parent 409afda
commit 5b13a32
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 34 deletions.
diff --git a/.github/workflows/build_test.service.yaml b/.github/workflows/build_test.service.yaml
@@ -64,7 +64,7 @@ jobs:
           cd service
           npm ci service
       - name: download service package
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mage.service-artifacts
       - name: extract service lib

diff --git a/.github/workflows/release.arcgis_plugin.yaml b/.github/workflows/release.arcgis_plugin.yaml
@@ -17,12 +17,11 @@ on:
   # release:
 
 jobs:
-
   config:
     uses: ./.github/workflows/config.yaml
 
   check_release_version:
-    needs: [ config ]
+    needs: [config]
     runs-on: ubuntu-latest
     steps:
       - name: checkout
@@ -41,16 +40,16 @@ jobs:
           [[ $(json version < ./plugins/arcgis/web-app/package.json) = ${{ inputs.version }} ]] || exit 1
 
   build_and_test-service:
-    needs: [ check_release_version ]
+    needs: [check_release_version]
     uses: ./.github/workflows/build_test.arcgis.service.yaml
 
   build_and_test-web-app:
-    needs: [ check_release_version ]
+    needs: [check_release_version]
     uses: ./.github/workflows/build_test.arcgis.web-app.yaml
 
   publish_packages:
-    name:  publish packages
-    needs: [ config, build_and_test-service ]
+    name: publish packages
+    needs: [config, build_and_test-service]
     runs-on: ubuntu-latest
     steps:
       - name: setup node
@@ -60,11 +59,11 @@ jobs:
       - name: install json util
         run: npm i -g json
       - name: download service packages
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: arcgis.service-artifacts
       - name: download web-app packages
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: arcgis.web-app-artifacts
       - name: publish to package registry

diff --git a/.github/workflows/release.image_plugin.yaml b/.github/workflows/release.image_plugin.yaml
@@ -17,12 +17,11 @@ on:
   # release:
 
 jobs:
-
   config:
     uses: ./.github/workflows/config.yaml
 
   check_release_version:
-    needs: [ config ]
+    needs: [config]
     runs-on: ubuntu-latest
     steps:
       - name: checkout
@@ -41,16 +40,16 @@ jobs:
       #     [[ $(json version < ./web-app/package.json) = ${{ inputs.version }} ]] || exit 1
 
   build_and_test-service:
-    needs: [ check_release_version ]
+    needs: [check_release_version]
     uses: ./.github/workflows/build_test.image.service.yaml
 
   # build_and_test-web-app:
   #   needs: [ check_release_version ]
   #   uses: ./.github/workflows/build_test.image.web-app.yaml
 
   publish_packages:
-    name:  publish packages
-    needs: [ config, build_and_test-service ]
+    name: publish packages
+    needs: [config, build_and_test-service]
     runs-on: ubuntu-latest
     steps:
       - name: setup node
@@ -60,7 +59,7 @@ jobs:
       - name: install json util
         run: npm i -g json
       - name: download service packages
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: image.service-artifacts
       - name: publish to package registry

diff --git a/.github/workflows/release.nga-msi_plugin.yaml b/.github/workflows/release.nga-msi_plugin.yaml
@@ -17,12 +17,11 @@ on:
   # release:
 
 jobs:
-
   config:
     uses: ./.github/workflows/config.yaml
 
   check_release_version:
-    needs: [ config ]
+    needs: [config]
     runs-on: ubuntu-latest
     steps:
       - name: checkout
@@ -38,12 +37,12 @@ jobs:
           [[ $(json version < ./plugins/nga-msi/package.json) = ${{ inputs.version }} ]] || exit 1
 
   build_and_test-service:
-    needs: [ check_release_version ]
+    needs: [check_release_version]
     uses: ./.github/workflows/build_test.nga-msi.yaml
 
   publish_packages:
-    name:  publish packages
-    needs: [ config, build_and_test-service ]
+    name: publish packages
+    needs: [config, build_and_test-service]
     runs-on: ubuntu-latest
     steps:
       - name: setup node
@@ -53,7 +52,7 @@ jobs:
       - name: install json util
         run: npm i -g json
       - name: download service packages
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nga-msi-artifacts
       - name: publish to package registry

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -27,12 +27,11 @@ on:
   # release:
 
 jobs:
-
   config:
     uses: ./.github/workflows/config.yaml
 
   check_release_version:
-    needs: [ config ]
+    needs: [config]
     runs-on: ubuntu-latest
     steps:
       - name: checkout
@@ -57,16 +56,16 @@ jobs:
           [[ $(json version < ./web-app/projects/core-lib/package.json) = ${{ inputs.version }} ]] || exit 1
 
   build_and_test-service:
-    needs: [ check_release_version ]
+    needs: [check_release_version]
     uses: ./.github/workflows/build_test.service.yaml
 
   build_and_test-web-app:
-    needs: [ check_release_version ]
+    needs: [check_release_version]
     uses: ./.github/workflows/build_test.web-app.yaml
 
   create_release:
     name: create release
-    needs: [ config, build_and_test-service, build_and_test-web-app ]
+    needs: [config, build_and_test-service, build_and_test-web-app]
     runs-on: ubuntu-latest
     steps:
       - name: setup node
@@ -76,11 +75,11 @@ jobs:
       - name: install json util
         run: npm i -g json
       - name: download service artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mage.service-artifacts
       - name: download web-app artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mage.web-app-artifacts
       - name: generate instance package.json
@@ -108,8 +107,8 @@ jobs:
             ngageoint-mage.*.tgz
 
   publish_packages:
-    name:  publish packages
-    needs: [ config, create_release ]
+    name: publish packages
+    needs: [config, create_release]
     runs-on: ubuntu-latest
     steps:
       - name: setup node
@@ -119,11 +118,11 @@ jobs:
       - name: install json util
         run: npm i -g json
       - name: download service packages
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mage.service-artifacts
       - name: download web-app packages
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mage.web-app-artifacts
       - name: publish to package registry

diff --git a/plugins/arcgis/service/package.json b/plugins/arcgis/service/package.json
@@ -47,6 +47,9 @@
     "@ngageoint/mage.service": "^6.2.9 || ^6.3.0-beta",
     "express": "^4.17.0"
   },
+  "optionalDependencies": {
+    "fsevents": "^2.3.3"
+  },
   "devDependencies": {
     "@types/express": "^4.17.21",
     "@types/geojson": "^7946.0.7",
@@ -58,4 +61,4 @@
     "ts-jest": "^26.1.1",
     "typescript": "^4.6.3"
   }
-}
+}
diff --git a/plugins/image/service/package.json b/plugins/image/service/package.json
@@ -40,6 +40,9 @@
     "express": "~4.17.0",
     "mongoose": "^6.13.0"
   },
+  "optionalDependencies": {
+    "fsevents": "^2.3.3"
+  },
   "devDependencies": {
     "@types/bson": "^4.0.2",
     "@types/express": "~4.17.17",
@@ -53,4 +56,4 @@
     "rimraf": "^5.0.5",
     "typescript": "^4.9.5"
   }
-}
+}