fix

masahide · Sep 8, 2024 · be223f7 · be223f7
1 parent e3f12ae
commit be223f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,8 +37,11 @@ jobs:
         run: |
           wails build -nsis
           go build -o build/bin/omni-socat.exe ./cmd/omni-socat
+          go build -o build/bin/agent-bench.exe ./cmd/agent-bench
           powershell Compress-Archive -Path build/bin/omni-socat.exe -DestinationPath build/bin/omni-socat.zip
           rm build/bin/omni-socat.exe
+          powershell Compress-Archive -Path build/bin/agent-bench.exe -DestinationPath build/bin/agent-bench.zip
+          rm build/bin/agent-bench.exe
           powershell Compress-Archive -Path build/bin/OmniSSHAgent.exe -DestinationPath build/bin/OmniSSHAgent.zip
           rm build/bin/OmniSSHAgent.exe
 
@@ -52,7 +55,7 @@ jobs:
         run: |
           echo "ls build/bin"  >> $env:GITHUB_STEP_SUMMARY
           ls "build/bin">> $env:GITHUB_STEP_SUMMARY
-  build-wsl2-ssh-agent-proxy:
+  build-linux:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -63,7 +66,9 @@ jobs:
       - name: build
         run: |
           CGO_ENABLED=0 go build -o build/bin/wsl2-ssh-agent-proxy ./cmd/wsl2-ssh-agent-proxy
+          CGO_ENABLED=0 go build -o build/bin/agent-bench ./cmd/agent-bench
           gzip build/bin/wsl2-ssh-agent-proxy
+          gzip build/bin/agent-bench
       - uses: actions/upload-artifact@v4
         with:
           name: build-files-linux
@@ -76,7 +81,7 @@ jobs:
   create-release:
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-22.04
-    needs: [build-exe, build-wsl2-ssh-agent-proxy]
+    needs: [build-exe, build-linux]
     steps:
       - uses: actions/checkout@v4
       - name: Download All Artifacts

diff --git a/hack/ubuntu.wsl2-ssh-agent-proxy.sh b/hack/ubuntu.wsl2-ssh-agent-proxy.sh
@@ -16,7 +16,7 @@ fi
 __get_proxy() {
   echo "Downloading ${NAME}.gz"
   mkdir -p "${PROXYCMD_DIR}"
-  curl "${REPO_URL}/releases/${VER_PATH}/${NAME}.gz" -sL | gunzip > "${CMD}"
+  curl "${REPO_URL}/releases/${VER_PATH}/${NAME}.gz" -sL | gunzip >"${CMD}"
   chmod +x "${CMD}"
 }
 
@@ -34,7 +34,7 @@ setup_proxy() {
     chmod 700 "${SSH_AUTH_SOCK_DIR}"
   fi
 
-  nohup "${CMD}" >> "${PROXYCMD_DIR}/${NAME}.log" 2>&1 &
+  (setsid "${CMD}" >>"${PROXYCMD_DIR}/${NAME}.log" 2>&1 &)
 }
 
 setup_proxy