Update workflows

.forgejo/workflows/deploy-rs.yml

@@ -9,7 +9,7 @@ jobs:
   deploy-rs:
     runs-on: ubuntu
     container: 
-      image: ubuntu:23.10
+      image: ubuntu:24.04
       options: --mount type=bind,src=/dev/net/tun,dst=/dev/net/tun --privileged
     steps:
     - name: "Runner: Info"
@@ -28,7 +28,7 @@ jobs:
     - name:  "Setup: Runner"
       run: |
         apt update -y
-        apt install git nodejs nix-bin sudo sudo curl -y
+        apt install git nodejs nix-bin sudo curl -y
         git config --global user.email "${{github.actor}}"
         git config --global user.name "Forgejo Runner"
         echo "100.64.0.14 gotify.sysctl.io" >> /etc/hosts
@@ -50,8 +50,6 @@ jobs:
         chmod 700 /root/.ssh
         chmod 600 /root/.ssh/id_ed25519 
         chmod 644 /root/.ssh/id_ed25519.pub
-        echo "Public Key:  "
-        cat /root/.ssh/id_ed25519.pub
 
     - name: "Setup:  Headscale Network"
       run: | 

.forgejo/workflows/update-flake-lock.yml

@@ -11,49 +11,95 @@ jobs:
     runs-on: ubuntu
     container: 
       image: ubuntu:24.04
+      options: --mount type=bind,src=/dev/net/tun,dst=/dev/net/tun --privileged
     steps:
-    - name:  "Setup Runner"
+    - name: "Runner: Info"
-      run: |
-        apt update -y
-        apt install git nodejs nix-bin qemu-utils qemu-system-arm qemu-user-binfmt -y
-        git config --global user.email "${{github.actor}}"
-        git config --global user.name "Forgejo Runner"
-        echo "100.64.0.14 gotify.sysctl.io" >> /etc/hosts
-    - uses: actions/checkout@v3
-    - name: "Directory Structure"
-      run: | 
-        ls ${{ github.workspace }}/*
-    - name: "Git Info"
-      run: |
-        git -C ${{ github.workspace }} status
-        git -C ${{ github.workspace }} log
-        git -C ${{ github.workspace }} diff
-    - name: "Runner:  Node Info"
       run: |
+        set -x
+        pwd
+        ls -lah 
         id
         uname -a
         hostname
         cat /etc/os-release
-    - name: "Nix Version"
+        whoami
-      run:  | 
+        id
-        nix --version
+        cat /etc/resolv.conf
-    - name: "Nix Flake Update"
+
+    - name:  "Setup: Runner"
+      run: |
+        apt update -y
+        apt install git nodejs nix-bin sudo curl -y
+        git config --global user.email "${{github.actor}}"
+        git config --global user.name "Forgejo Runner"
+        echo "100.64.0.14 gotify.sysctl.io" >> /etc/hosts
+
+    - name: "Setup:  Tailscale Repo"
       run: | 
-        echo "Running Nix Flake Update"
+        mkdir -p --mode=0755 /usr/share/keyrings
-        cd /workspace/albert/nix
+        curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/lunar.noarmor.gpg | sudo tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null
-        git pull
+        curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/lunar.tailscale-keyring.list | sudo tee /etc/apt/sources.list.d/tailscale.list
-        nix --extra-experimental-features "nix-command flakes" flake update
+        apt update -y
-        echo "Git Diff:"
+        apt install tailscale -y
-        git diff
+   
-    - name: "Nix Flake Check"
+    - name:  "Setup: SSH"
+      run: |
+        rm -rf /root/.ssh 
+        mkdir /root/.ssh
+        echo "${{ secrets.SSH_PUBLIC_KEY }}"  > /root/.ssh/id_ed25519.pub 
+        echo "${{ secrets.SSH_PRIVATE_KEY }}" > /root/.ssh/id_ed25519
+        chmod 700 /root/.ssh
+        chmod 600 /root/.ssh/id_ed25519 
+        chmod 644 /root/.ssh/id_ed25519.pub
+
+    - name: "Setup:  Headscale Network"
       run: | 
-        echo "Running Nix Flake Check"
+        echo "tailscaled --cleanup"
-        cd /workspace/albert/nix 
+        sudo tailscaled --cleanup
-        nix --extra-experimental-features "nix-command flakes" flake check
+        echo ""
+        echo "tailscaled --state=mem 2> ~/tailscaled.log &"
+        sudo tailscaled --state=mem: 2> ~/tailscaled.log &
+        echo ""
+        echo "tailscale up"
+        sudo tailscale up \
+            --login-server=https://headscale.sysctl.io \
+            --accept-routes \
+            --accept-dns \
+            --authkey ${{ secrets.TAILSCALE_KEY }}  \
+            --hostname forgejo-runner \
+            --advertise-tags "tag:forgejo,tag:container,tag:ephemeral"
+        sudo tailscale status 
+        sudo tailscale netcheck
+
+
+    - name: "SSH and Deploy"
+      run: |  
+        ssh -q -A -o StrictHostKeyChecking=no albert@framework-server \
+            "
+            set -x 
+            eval (ssh-agent -c)
+            ssh-add
+            env | grep SSH
+            cd /etc/nixos/git
+            git pull
+            nix flake update 
+            nix flake check
+            "
+
     - if: success()
-      run: | 
+      name: "Sucess:  Git Commit & Push"
-        git commit -am "[ACTIONS] Flake Update (`date +%Y-%m-%d`)"
+      run: |  
-        git push 
+        ssh -q -A -o StrictHostKeyChecking=no albert@framework-server \
+            "
+            set -x 
+            eval (ssh-agent -c)
+            ssh-add
+            env | grep SSH
+            cd /etc/nixos/git
+            git commit -am '[ACTIONS] Flake Update (`date +%Y-%m-%d`)'
+            git push 
+            "
+
     - if: success()
       uses:  https://git.sysctl.io/actions/gotify-action@master
       with: