From 583071899fc0186b23b4b64bef12f46f75d09fcf Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 3 Mar 2025 11:35:05 -0500 Subject: [PATCH 1/3] more runners --- systems/palatine-hill/docker/act-runner.nix | 71 ++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/systems/palatine-hill/docker/act-runner.nix b/systems/palatine-hill/docker/act-runner.nix index f0cfa57..9bfd0e1 100644 --- a/systems/palatine-hill/docker/act-runner.nix +++ b/systems/palatine-hill/docker/act-runner.nix @@ -9,6 +9,29 @@ let in { virtualisation.oci-containers.containers = { + act-stable-latest-main = { + image = "gitea/act_runner:latest"; + extraOptions = [ + "--stop-signal=SIGINT" + ]; + labels = { + "com.centurylinklabs.watchtower.enable" = "true"; + "com.centurylinklabs.watchtower.scope" = "act-runner"; + }; + ports = [ "8088:8088" ]; + volumes = [ + "${act_path}/stable-latest-main/config.yaml:/config.yaml" + "${act_path}/stable-latest-main/data:/data" + "/var/run/docker.sock:/var/run/docker.sock" + ]; + environment = { + CONFIG_FILE = "/config.yaml"; + GITEA_RUNNER_NAME = "stable-latest-main"; + }; + environmentFiles = [ config.sops.secrets."docker/act-runner".path ]; + log-driver = "local"; + }; + act-stable-latest-1 = { image = "gitea/act_runner:latest"; extraOptions = [ @@ -41,7 +64,7 @@ in "com.centurylinklabs.watchtower.enable" = "true"; "com.centurylinklabs.watchtower.scope" = "act-runner"; }; - # ports = [ "8088:8088" ]; + ports = [ "8088:8088" ]; volumes = [ "${act_path}/stable-latest-2/config.yaml:/config.yaml" "${act_path}/stable-latest-2/data:/data" @@ -77,6 +100,52 @@ in environmentFiles = [ config.sops.secrets."docker/act-runner".path ]; log-driver = "local"; }; + + act-stable-latest-4 = { + image = "gitea/act_runner:latest"; + extraOptions = [ + "--stop-signal=SIGINT" + ]; + labels = { + "com.centurylinklabs.watchtower.enable" = "true"; + "com.centurylinklabs.watchtower.scope" = "act-runner"; + }; + # ports = [ "8088:8088" ]; + volumes = [ + "${act_path}/stable-latest-4/config.yaml:/config.yaml" + "${act_path}/stable-latest-4/data:/data" + "/var/run/docker.sock:/var/run/docker.sock" + ]; + environment = { + CONFIG_FILE = "/config.yaml"; + GITEA_RUNNER_NAME = "stable-latest-4"; + }; + environmentFiles = [ config.sops.secrets."docker/act-runner".path ]; + log-driver = "local"; + }; + + act-stable-latest-5 = { + image = "gitea/act_runner:latest"; + extraOptions = [ + "--stop-signal=SIGINT" + ]; + labels = { + "com.centurylinklabs.watchtower.enable" = "true"; + "com.centurylinklabs.watchtower.scope" = "act-runner"; + }; + # ports = [ "8088:8088" ]; + volumes = [ + "${act_path}/stable-latest-5/config.yaml:/config.yaml" + "${act_path}/stable-latest-5/data:/data" + "/var/run/docker.sock:/var/run/docker.sock" + ]; + environment = { + CONFIG_FILE = "/config.yaml"; + GITEA_RUNNER_NAME = "stable-latest-5"; + }; + environmentFiles = [ config.sops.secrets."docker/act-runner".path ]; + log-driver = "local"; + }; }; systemd = { -- 2.48.1 From 96219eb175c65d73e98806fd308fca4e781e1c2c Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 3 Mar 2025 11:44:13 -0500 Subject: [PATCH 2/3] remove port from 1 --- systems/palatine-hill/docker/act-runner.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/systems/palatine-hill/docker/act-runner.nix b/systems/palatine-hill/docker/act-runner.nix index 9bfd0e1..df7b2e1 100644 --- a/systems/palatine-hill/docker/act-runner.nix +++ b/systems/palatine-hill/docker/act-runner.nix @@ -41,7 +41,6 @@ in "com.centurylinklabs.watchtower.enable" = "true"; "com.centurylinklabs.watchtower.scope" = "act-runner"; }; - ports = [ "8088:8088" ]; volumes = [ "${act_path}/stable-latest-1/config.yaml:/config.yaml" "${act_path}/stable-latest-1/data:/data" -- 2.48.1 From 6ab1d1a3c6f35abaf59046b743edcbf0cff0df81 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 3 Mar 2025 11:58:21 -0500 Subject: [PATCH 3/3] remove keep-hydra --- .github/workflows/flake-update.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index fbfac81..f959a7b 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -28,13 +28,13 @@ jobs: cache: ${{ secrets.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} - name: Calculate pre-drv - run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- --keep-hydra . + run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- . # - name: Pull latest docker images # run: nix ./utils/fetch-docker.sh - name: Update flake.lock (part 1) run: nix flake update - name: Calculate post-drv - run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- --keep-hydra . + run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- . # - name: Calculate diff # run: nix ./utils/diff-evals.sh # - name: Read diff into environment -- 2.48.1