Merge pull request #1827 from habitat-sh/agadgil/lts-2024-node-updates

`builder-api-proxy` dependencies updated for LTS-2024 channel
habitat-sh · Aug 22, 2024 · 3dbf9c1 · 3dbf9c1
2 parents 41e593d + d8a51a6
commit 3dbf9c1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
@@ -190,4 +190,24 @@ steps:
         docker:
           privileged: true
           environment:
-            - HAB_ORIGIN=ci
+            - HAB_ORIGIN=ci
+
+  - label: "[build] :linux: builder-api-proxy"
+    command:
+      - hab origin key generate habitat
+      - hab pkg build components/builder-api-proxy/habitat/
+    retry:
+      automatic:
+        limit: 1
+    expeditor:
+      executor:
+        docker:
+          privileged: true
+          environment:
+            - HAB_ORIGIN=habitat
+            # The following variables are only set inside `studio` and how we enter
+            # `studio` should not matter.
+            # test test
+            - HAB_STUDIO_SECRET_NODE_OPTIONS="--dns-result-order=ipv4first"
+            - HAB_STUDIO_SECRET_HAB_BLDR_CHANNEL=LTS-2024
+            - HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL=LTS-2024
diff --git a/components/builder-api-proxy/habitat/plan.sh b/components/builder-api-proxy/habitat/plan.sh
@@ -8,11 +8,8 @@ pkg_deps=(core/nginx core/curl core/coreutils)
 
 pkg_build_deps=(
   core/node/"$(cat "$PLAN_CONTEXT/../../builder-web/.nvmrc")"
-  core/gcc
   core/git
   core/tar
-  core/python2
-  core/make
 )
 pkg_svc_user="root"
 # shellcheck disable=2154
@@ -34,6 +31,7 @@ pkg_version() {
 }
 
 do_before() {
+  git config --global --add safe.directory /src
   update_pkg_version
 }
 

diff --git a/components/builder-web/.nvmrc b/components/builder-web/.nvmrc
@@ -1 +1 @@
-14.18.1
+18.12.1
diff --git a/components/builder-web/package.json b/components/builder-web/package.json
@@ -75,7 +75,7 @@
     "concurrently": "^3.6.1",
     "http-proxy-middleware": "^0.19.2",
     "jasmine-core": "^3.7.1",
-    "karma": "^6.3.2",
+    "karma": "^6.4.4",
     "karma-chrome-launcher": "^3.1.0",
     "karma-cli": "^2.0.0",
     "karma-coverage": "^2.0.3",
@@ -84,11 +84,11 @@
     "karma-phantomjs-launcher": "^1.0.4",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-spec-reporter": "0.0.32",
-    "karma-webpack": "^4.0.2",
+    "karma-webpack": "^5.0.1",
     "lite-server": "^2.6.1",
     "loader-utils": "^1.4.2",
     "ng2-mock-component": "^0.1.0",
-    "node-sass": "^4.14.1",
+    "node-sass": "^8.0.0",
     "normalize-scss": "^7.0.0",
     "phantomjs-prebuilt": "^2.1.16",
     "raw-loader": "^0.5.1",
@@ -99,7 +99,7 @@
     "tsun": "^0.5.0",
     "typescript": "^3.9.9",
     "watch": "^1.0.2",
-    "webpack": "^4.46.0",
-    "webpack-cli": "^3.3.12"
+    "webpack": "^5.93.0",
+    "webpack-cli": "^5.1.4"
   }
 }