Set ssh options in workflow

joinemm · Jul 10, 2024 · bdb9508 · bdb9508
1 parent fab4f7f
commit bdb9508
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -55,14 +55,24 @@ jobs:
           cache: "cache"
           token: '${{ secrets.ATTIC_AUTH_TOKEN }}'
 
+      - name: Ssh config
+        run: |
+          sudo sh -c "cat >> /etc/ssh/ssh_config << EOF
+          Host *
+              ControlMaster auto
+              ControlPath /etc/ssh/sockets/%r@%h-%p
+              ControlPersist 5s
+          EOF"
+          cat /etc/ssh/ssh_config
+
       - name: Configure remote builders
         run: |
           sudo sh -c "umask 377; echo '${{ secrets.BUILDER_SSH_KEY }}' >/etc/nix/id_builder_key"
 
-          sudo sh -c "echo 'ssh://[email protected] aarch64-linux /etc/nix/id_builder_key 40 1 nixos-test,benchmark,big-parallel,kvm - -' >/etc/nix/machines"
+          sudo sh -c "echo 'ssh://[email protected] aarch64-linux /etc/nix/id_builder_key 20 1 nixos-test,benchmark,big-parallel,kvm - -' >/etc/nix/machines"
           sudo sh -c "echo 'hetzarm.vedenemo.dev ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILx4zU4gIkTY/1oKEOkf9gTJChdx/jR3lDgZ7p/c7LEK' >>/etc/ssh/ssh_known_hosts"
           
-          sudo sh -c "echo 'ssh://[email protected] x86_64-linux,i686-linux /etc/nix/id_builder_key 32 1 kvm,benchmark,big-parallel,nixos-test - -' >>/etc/nix/machines"
+          sudo sh -c "echo 'ssh://[email protected] x86_64-linux,i686-linux /etc/nix/id_builder_key 16 1 kvm,benchmark,big-parallel,nixos-test - -' >>/etc/nix/machines"
           sudo sh -c "echo 'builder.vedenemo.dev ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHSI8s/wefXiD2h3I3mIRdK+d9yDGMn0qS5fpKDnSGqj' >>/etc/ssh/ssh_known_hosts"