👮 Support adding a specific clone token (#245)

* 👮 Support adding a specific clone token * 👮 Support adding a specific clone token * 👮 Support adding a specific clone token
lunarway · Sep 16, 2024 · 7a4d06d · 7a4d06d
1 parent 1859e2d
commit 7a4d06d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ dist/
 vendor/
 shuttle
 .shuttle
-.idea
+.idea
+.DS_Store
diff --git a/action.yml b/action.yml
@@ -1,12 +1,14 @@
-name: 'Install Shuttle'
-description: 'Installs Lunar Shuttle'
+name: "Install Shuttle"
+description: "Installs Lunar Shuttle"
 runs:
   using: "composite"
   steps:
     - run: |
+        set -e
+
         if [ "$(uname)" == "Darwin" ]; then
             mkdir -p ~/bin
-            
+
             if [[ $(uname -m) == 'arm64' ]]; then
                 curl -LO https://github.com/lunarway/shuttle/releases/download/$(curl -Lso /dev/null -w %{url_effective} https://github.com/lunarway/shuttle/releases/latest | awk -F'/' '{print $NF}')/shuttle-darwin-arm64
                 chmod +x shuttle-darwin-arm64

diff --git a/pkg/git/git.go b/pkg/git/git.go
@@ -161,7 +161,12 @@ func GetGitPlan(
 
 		var cloneArg string
 		if parsedGitPlan.Protocol == "https" {
-			cloneArg = "https://" + parsedGitPlan.Repository
+			cloneToken := os.Getenv("SHUTTLE_GIT_TOKEN")
+			if cloneToken == "" {
+				cloneArg = "https://" + parsedGitPlan.Repository
+			} else {
+				cloneArg = fmt.Sprintf("https://%s:%s", cloneToken, parsedGitPlan.Repository)
+			}
 		} else if parsedGitPlan.Protocol == "ssh" {
 			cloneArg = parsedGitPlan.User + "@" + parsedGitPlan.Repository
 		} else {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,5 @@ dist/ @@
     vendor/
     shuttle
     .shuttle
-    .idea
+    .idea
+    .DS_Store