chore: run all e2e tests on CI

aspect-build · Apr 6, 2024 · acbafff · acbafff
1 parent 3ac5b46
commit acbafff
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 62 deletions.
diff --git a/.aspect/workflows/config.yaml b/.aspect/workflows/config.yaml
@@ -18,6 +18,32 @@ workspaces:
                   without: true
             - delivery:
                   without: true
+    e2e/git_dep_metadata:
+        icon: npm
+        tasks:
+            - test:
+                  queue: aspect-medium
+            - format:
+                  without: true
+            - buildifier:
+                  without: true
+            - configure:
+                  without: true
+            - delivery:
+                  without: true
+    e2e/gyp_no_install_script:
+        icon: npm
+        tasks:
+            - test:
+                  queue: aspect-medium
+            - format:
+                  without: true
+            - buildifier:
+                  without: true
+            - configure:
+                  without: true
+            - delivery:
+                  without: true
     # rules_docker not compatible with Bazel 7.
     # See https://github.com/bazelbuild/bazel/issues/20494#issuecomment-1852401451.
     # e2e/js_image_docker:

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,9 +4,9 @@ name: CI
 on:
     # Triggers the workflow on push or pull request events but only for the main branch
     push:
-        branches: [main]
+        branches: [main, 2.x]
     pull_request:
-        branches: [main]
+        branches: [main, 2.x]
 
     # Allows you to run this workflow manually from the Actions tab
     workflow_dispatch:
@@ -55,13 +55,17 @@ jobs:
                   a=(
                     .
                     e2e/bzlmod
+                    e2e/git_dep_metadata
+                    e2e/gyp_no_install_script
                     e2e/js_image_docker
                     e2e/js_image_oci
                     e2e/js_run_devserver
                     e2e/npm_link_package
                     e2e/npm_link_package-esm
                     e2e/npm_translate_lock
+                    e2e/npm_translate_lock_auth
                     e2e/npm_translate_lock_empty
+                    e2e/npm_translate_lock_git+ssh
                     e2e/npm_translate_lock_multi
                     e2e/npm_translate_lock_partial_clone
                     e2e/npm_translate_lock_subdir_patch

diff --git a/e2e/gyp_no_install_script/MODULE.bazel b/e2e/gyp_no_install_script/MODULE.bazel
@@ -1,5 +1,7 @@
 bazel_dep(name = "aspect_bazel_lib", version = "2.7.0")
 bazel_dep(name = "aspect_rules_js", version = "0.0.0")
+bazel_dep(name = "platforms", version = "0.0.8")
+
 local_path_override(
     module_name = "aspect_rules_js",
     path = "../..",

diff --git a/e2e/gyp_no_install_script/snapshots/bzlmod/repositories.bzl b/e2e/gyp_no_install_script/snapshots/bzlmod/repositories.bzl
diff --git a/e2e/gyp_no_install_script/snapshots/bzlmod/segfault-handler_defs.bzl b/e2e/gyp_no_install_script/snapshots/bzlmod/segfault-handler_defs.bzl
diff --git a/e2e/gyp_no_install_script/snapshots/wksp/repositories.bzl b/e2e/gyp_no_install_script/snapshots/wksp/repositories.bzl
diff --git a/e2e/gyp_no_install_script/snapshots/wksp/segfault-handler_defs.bzl b/e2e/gyp_no_install_script/snapshots/wksp/segfault-handler_defs.bzl
diff --git a/e2e/npm_translate_lock/snapshots/wksp/repositories.bzl b/e2e/npm_translate_lock/snapshots/wksp/repositories.bzl
diff --git a/npm/extensions.bzl b/npm/extensions.bzl
@@ -108,7 +108,7 @@ def _npm_extension_impl(module_ctx):
                 (registries, npm_auth) = npm_translate_lock_helpers.get_npm_auth(npmrc, module_ctx.path(attr.npmrc), module_ctx.os.environ)
 
             if attr.use_home_npmrc:
-                home_directory = bazel_lib_utils.home_directory(module_ctx)
+                home_directory = bazel_lib_utils.get_home_directory(module_ctx)
                 if home_directory:
                     home_npmrc_path = "{}/{}".format(home_directory, ".npmrc")
                     home_npmrc = parse_npmrc(module_ctx.read(home_npmrc_path))

diff --git a/npm/private/npm_translate_lock_state.bzl b/npm/private/npm_translate_lock_state.bzl
@@ -484,7 +484,7 @@ def _load_npmrc(priv, rctx, npmrc_path):
 
 ################################################################################
 def _load_home_npmrc(priv, rctx):
-    home_directory = bazel_lib_utils.home_directory(rctx)
+    home_directory = bazel_lib_utils.get_home_directory(rctx)
     if not home_directory:
         # buildifier: disable=print
         print("""