From 75359032b19aad19d083dc6e9d8b3621ad1867fe Mon Sep 17 00:00:00 2001 From: UGA Innovation Factory Date: Thu, 18 Dec 2025 13:54:23 -0500 Subject: [PATCH 01/10] change requirements --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 342ef1c..51c9431 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -15,7 +15,6 @@ jobs: name: Flake Check runs-on: [self-hosted, nix-builder] # Only auto-run on main branch, PRs require workflow_dispatch - if: gitea.event_name == 'push' && gitea.ref == 'refs/heads/main' needs: [format-check] steps: - name: Checkout repository @@ -27,6 +26,7 @@ jobs: format-check: name: Format Check runs-on: [self-hosted, nix-builder] + if: gitea.event_name == 'push' && gitea.ref == 'refs/heads/main' steps: - name: Checkout repository uses: actions/checkout@v4 From 5eeaa48f091113dc9ef16b7a639a66b1ad74385e Mon Sep 17 00:00:00 2001 From: UGA Innovation Factory Date: Thu, 18 Dec 2025 13:57:40 -0500 Subject: [PATCH 02/10] Revert "change requirements" This reverts commit 75359032b19aad19d083dc6e9d8b3621ad1867fe. --- .gitea/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 51c9431..342ef1c 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: name: Flake Check runs-on: [self-hosted, nix-builder] # Only auto-run on main branch, PRs require workflow_dispatch + if: gitea.event_name == 'push' && gitea.ref == 'refs/heads/main' needs: [format-check] steps: - name: Checkout repository @@ -26,7 +27,6 @@ jobs: format-check: name: Format Check runs-on: [self-hosted, nix-builder] - if: gitea.event_name == 'push' && gitea.ref == 'refs/heads/main' steps: - name: Checkout repository uses: actions/checkout@v4 From 385a7e4a0a8422ed586fa2106461c1ee557c0047 Mon Sep 17 00:00:00 2001 From: UGA Innovation Factory Date: Thu, 18 Dec 2025 14:16:10 -0500 Subject: [PATCH 03/10] run on pr review, not pr --- .gitea/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 342ef1c..e163074 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -4,7 +4,8 @@ on: push: branches: - main - pull_request: + pull_request_review: + workflow_dispatch: permissions: @@ -14,8 +15,6 @@ jobs: flake-check: name: Flake Check runs-on: [self-hosted, nix-builder] - # Only auto-run on main branch, PRs require workflow_dispatch - if: gitea.event_name == 'push' && gitea.ref == 'refs/heads/main' needs: [format-check] steps: - name: Checkout repository From d055e875acdec8afaf868ee6b50133146812f970 Mon Sep 17 00:00:00 2001 From: UGA Innovation Factory Date: Thu, 18 Dec 2025 15:22:32 -0500 Subject: [PATCH 04/10] docker compose runner for usda-dash --- inventory.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory.nix b/inventory.nix index 3dbdf6c..6b5ea69 100644 --- a/inventory.nix +++ b/inventory.nix @@ -122,7 +122,7 @@ }; "usda-dash" = builtins.fetchGit { url = "https://git.factory.uga.edu/MODEL/usda-dash-config.git"; - rev = "98f19ed8f8a6fed29d0947604bc14b403547a10d"; + rev = "ada162163e3c1b96b7564f0f7ad6e8f4610ba640"; }; }; overrides = { From bfa907aa7389ec71fb839b4578b8a2625205ea79 Mon Sep 17 00:00:00 2001 From: UGA Innovation Factory Date: Thu, 18 Dec 2025 15:37:45 -0500 Subject: [PATCH 05/10] use ssh for usda-dash git fetch --- inventory.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory.nix b/inventory.nix index 6b5ea69..5a63689 100644 --- a/inventory.nix +++ b/inventory.nix @@ -121,7 +121,7 @@ }; }; "usda-dash" = builtins.fetchGit { - url = "https://git.factory.uga.edu/MODEL/usda-dash-config.git"; + url = "git+ssh://git@factory.uga.edu/MODEL/usda-dash-config.git"; rev = "ada162163e3c1b96b7564f0f7ad6e8f4610ba640"; }; }; From ec9ec88d5ab2ab072eb98d44eb482ca51a6baf7d Mon Sep 17 00:00:00 2001 From: UGA Innovation Factory Date: Thu, 18 Dec 2025 15:46:48 -0500 Subject: [PATCH 06/10] use submodules for usda-dash --- inventory.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/inventory.nix b/inventory.nix index 5a63689..f099045 100644 --- a/inventory.nix +++ b/inventory.nix @@ -123,6 +123,7 @@ "usda-dash" = builtins.fetchGit { url = "git+ssh://git@factory.uga.edu/MODEL/usda-dash-config.git"; rev = "ada162163e3c1b96b7564f0f7ad6e8f4610ba640"; + submodules = true; }; }; overrides = { From 090f8081ff275dedf017c2eabbcc1b63fd61f978 Mon Sep 17 00:00:00 2001 From: UGA Innovation Factory Date: Thu, 18 Dec 2025 15:58:59 -0500 Subject: [PATCH 07/10] update external usda-dash-config repo --- inventory.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory.nix b/inventory.nix index f099045..ece5e02 100644 --- a/inventory.nix +++ b/inventory.nix @@ -122,7 +122,7 @@ }; "usda-dash" = builtins.fetchGit { url = "git+ssh://git@factory.uga.edu/MODEL/usda-dash-config.git"; - rev = "ada162163e3c1b96b7564f0f7ad6e8f4610ba640"; + rev = "5f32d4e3cdb3d7710b6d00cd896049614e6d0b35"; submodules = true; }; }; From 7b470382132dca741bd56ea1d61433f104602bf6 Mon Sep 17 00:00:00 2001 From: UGA Innovation Factory Date: Thu, 18 Dec 2025 16:08:45 -0500 Subject: [PATCH 08/10] update external docker module --- inventory.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory.nix b/inventory.nix index ece5e02..d0b8048 100644 --- a/inventory.nix +++ b/inventory.nix @@ -122,7 +122,7 @@ }; "usda-dash" = builtins.fetchGit { url = "git+ssh://git@factory.uga.edu/MODEL/usda-dash-config.git"; - rev = "5f32d4e3cdb3d7710b6d00cd896049614e6d0b35"; + rev = "0b2c845c1fe5e9c613f49e8c421ea219e735be83"; submodules = true; }; }; From 0ffb73283d706c8f0963d5fa02db01f1037135c5 Mon Sep 17 00:00:00 2001 From: UGA Innovation Factory Date: Thu, 18 Dec 2025 16:15:07 -0500 Subject: [PATCH 09/10] update external config for usda-dash --- inventory.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory.nix b/inventory.nix index d0b8048..c161317 100644 --- a/inventory.nix +++ b/inventory.nix @@ -122,7 +122,7 @@ }; "usda-dash" = builtins.fetchGit { url = "git+ssh://git@factory.uga.edu/MODEL/usda-dash-config.git"; - rev = "0b2c845c1fe5e9c613f49e8c421ea219e735be83"; + rev = "16acf79ba856dadcd5bf5a74aa840bd0dc4693a7"; submodules = true; }; }; From f65ba590a6e1d0fe4256a3f1dc63adc62a0f1558 Mon Sep 17 00:00:00 2001 From: UGA Innovation Factory Date: Thu, 18 Dec 2025 16:24:37 -0500 Subject: [PATCH 10/10] update external config for usda-dash --- inventory.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory.nix b/inventory.nix index c161317..fa2b5ba 100644 --- a/inventory.nix +++ b/inventory.nix @@ -122,7 +122,7 @@ }; "usda-dash" = builtins.fetchGit { url = "git+ssh://git@factory.uga.edu/MODEL/usda-dash-config.git"; - rev = "16acf79ba856dadcd5bf5a74aa840bd0dc4693a7"; + rev = "3dfc2ab02533afbbd4c3ac464003700e73a47603"; submodules = true; }; };