Fix hook args.

moonrepo · Sep 28, 2023 · f80013c · f80013c
1 parent 200ecee
commit f80013c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/crates/core/moon/src/lib.rs b/crates/core/moon/src/lib.rs
@@ -44,7 +44,7 @@ pub async fn load_workspace() -> miette::Result<Workspace> {
     if !is_test_env() {
         if workspace.vcs.is_enabled() {
             if let Ok(slug) = workspace.vcs.get_repository_slug().await {
-                env::set_var("MOON_REPO_SLUG", slug);
+                env::set_var("MOONBASE_REPO_SLUG", slug);
             }
         }
 

diff --git a/nextgen/api/src/launchpad.rs b/nextgen/api/src/launchpad.rs
@@ -48,7 +48,6 @@ fn create_anonymous_rid(workspace_root: &Path) -> String {
         "{:x}",
         md5::compute(
             env::var("MOONBASE_REPO_SLUG")
-                .or_else(|_| env::var("MOON_REPO_SLUG"))
                 .unwrap_or_else(|_| fs::file_name(workspace_root)),
         )
     )

diff --git a/nextgen/vcs-hooks/tests/snapshots/hooks_generator_test__unix__links_git_hooks-2.snap b/nextgen/vcs-hooks/tests/snapshots/hooks_generator_test__unix__links_git_hooks-2.snap
@@ -5,4 +5,4 @@ expression: "fs::read_to_string(post_push).unwrap()"
 #!/usr/bin/env bash
 set -eo pipefail
 
-./.moon/hooks/post-push.sh
+./.moon/hooks/post-push.sh $1 $2 $3
diff --git a/nextgen/vcs-hooks/tests/snapshots/hooks_generator_test__unix__links_git_hooks.snap b/nextgen/vcs-hooks/tests/snapshots/hooks_generator_test__unix__links_git_hooks.snap
@@ -5,4 +5,4 @@ expression: "fs::read_to_string(pre_commit).unwrap()"
 #!/usr/bin/env bash
 set -eo pipefail
 
-./.moon/hooks/pre-commit.sh
+./.moon/hooks/pre-commit.sh $1 $2 $3
diff --git a/nextgen/vcs-hooks/tests/snapshots/hooks_generator_test__windows__links_git_hooks-2.snap b/nextgen/vcs-hooks/tests/snapshots/hooks_generator_test__windows__links_git_hooks-2.snap
@@ -3,4 +3,4 @@ source: nextgen/vcs-hooks/tests/hooks_generator_test.rs
 expression: "out2.replace(\"powershell.exe\", \"pwsh.exe\")"
 ---
 #!/bin/sh
-pwsh.exe -NoProfile -ExecutionPolicy Bypass -File '.\.moon\hooks\post-push.ps1'
+pwsh.exe -NoProfile -ExecutionPolicy Bypass -File ".\.moon\hooks\post-push.ps1 $1 $2 $3"
diff --git a/nextgen/vcs-hooks/tests/snapshots/hooks_generator_test__windows__links_git_hooks.snap b/nextgen/vcs-hooks/tests/snapshots/hooks_generator_test__windows__links_git_hooks.snap
@@ -3,4 +3,4 @@ source: nextgen/vcs-hooks/tests/hooks_generator_test.rs
 expression: "out1.replace(\"powershell.exe\", \"pwsh.exe\")"
 ---
 #!/bin/sh
-pwsh.exe -NoProfile -ExecutionPolicy Bypass -File '.\.moon\hooks\pre-commit.ps1'
+pwsh.exe -NoProfile -ExecutionPolicy Bypass -File ".\.moon\hooks\pre-commit.ps1 $1 $2 $3"
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -15,6 +15,8 @@
 #### 🐞 Fixes
 
 - Fixed an issue where non-YAML files in `.moon/tasks` would be parsed as YAML configs.
+- Fixed an issue where arguments were not passed to generated Git hooks.
+- Fixed an issue where moonbase would fail to sign in in CI.
 
 ## 1.14.1