diff --git a/.forgejo/workflows/cron/auto-deploy-rs.yml b/.forgejo/workflows/cron/auto-deploy-rs.yml index ee748fc9..3f0a402f 100644 --- a/.forgejo/workflows/cron/auto-deploy-rs.yml +++ b/.forgejo/workflows/cron/auto-deploy-rs.yml @@ -17,7 +17,6 @@ jobs: - name: "Setup: Runner" run: | set -x - echo 'Why is nothing being output here' apt update -y apt install git nodejs nix-bin sudo curl -y git config --global user.email ${{github.actor}} diff --git a/.forgejo/workflows/dispatch/manual-deploy-rs.yml b/.forgejo/workflows/dispatch/manual-deploy-rs.yml index 43436729..e2a8a47e 100644 --- a/.forgejo/workflows/dispatch/manual-deploy-rs.yml +++ b/.forgejo/workflows/dispatch/manual-deploy-rs.yml @@ -16,7 +16,6 @@ jobs: - name: "Setup: Runner" run: | set -x - echo 'Why is nothing being output here' apt update -y apt install git nodejs nix-bin sudo curl -y git config --global user.email ${{github.actor}} @@ -43,7 +42,7 @@ jobs: chmod 644 /root/.ssh/id_ed25519.pub echo "Result: $?" - - name: "Setup: Headscale Network" + - name: "Setup: Headscale Network" run: | set -x sudo tailscaled --cleanup diff --git a/.forgejo/workflows/dispatch/update-flake-lock.yml b/.forgejo/workflows/dispatch/update-flake-lock.yml index 3e961b41..c72091c8 100644 --- a/.forgejo/workflows/dispatch/update-flake-lock.yml +++ b/.forgejo/workflows/dispatch/update-flake-lock.yml @@ -5,6 +5,7 @@ run-name: ${{ github.actor }} - update-flake-lock on: workflow_dispatch: inputs: + jobs: update-flake-lock: runs-on: ubuntu @@ -14,6 +15,7 @@ jobs: steps: - name: "Setup: Runner" run: | + set -x apt update -y apt install git nodejs nix-bin sudo curl -y git config --global user.email "${{github.actor}}" @@ -22,6 +24,7 @@ jobs: - name: "Setup: Tailscale Repo" run: | + set -x mkdir -p --mode=0755 /usr/share/keyrings curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/lunar.noarmor.gpg | sudo tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/lunar.tailscale-keyring.list | sudo tee /etc/apt/sources.list.d/tailscale.list @@ -37,16 +40,13 @@ jobs: chmod 700 /root/.ssh chmod 600 /root/.ssh/id_ed25519 chmod 644 /root/.ssh/id_ed25519.pub + echo "Result: $?" - name: "Setup: Headscale Network" run: | - echo "tailscaled --cleanup" + set -x sudo tailscaled --cleanup - 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 \ @@ -56,7 +56,7 @@ jobs: --advertise-tags "tag:forgejo,tag:container,tag:ephemeral" sudo tailscale status sudo tailscale netcheck - + echo "Result: $?" - name: "SSH and Update / Check" run: | diff --git a/.forgejo/workflows/dispatch/update-steamdeck.yml b/.forgejo/workflows/dispatch/update-steamdeck.yml index b294cace..b9faeb63 100644 --- a/.forgejo/workflows/dispatch/update-steamdeck.yml +++ b/.forgejo/workflows/dispatch/update-steamdeck.yml @@ -15,14 +15,16 @@ jobs: steps: - name: "Setup: Runner" run: | + set -x apt update -y apt install git nodejs nix-bin sudo sudo curl -y - git config user.email "${{github.actor}}" - git config user.name "Forgejo Runner" + git config --global user.email "${{github.actor}}" + git config --global user.name "Forgejo Runner" echo "100.64.0.13 gotify.sysctl.io" >> /etc/hosts - name: "Setup: Tailscale Repo" run: | + set -x mkdir -p --mode=0755 /usr/share/keyrings curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/lunar.noarmor.gpg | sudo tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/lunar.tailscale-keyring.list | sudo tee /etc/apt/sources.list.d/tailscale.list @@ -38,18 +40,13 @@ 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 + echo "Result: $?" - - name: "Setup: Headscale Network" + - name: "Setup: Headscale Network" run: | - echo "tailscaled --cleanup" + set -x sudo tailscaled --cleanup - 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 \ @@ -59,6 +56,7 @@ jobs: --advertise-tags "tag:forgejo,tag:container,tag:ephemeral" sudo tailscale status sudo tailscale netcheck + echo "Result: $?" - name: "nixos-version (Pre)" run: |