diff --git a/.github/actions/nix-setup/action.yaml b/.github/actions/nix-setup/action.yaml index 6de0e03..04b2f0f 100644 --- a/.github/actions/nix-setup/action.yaml +++ b/.github/actions/nix-setup/action.yaml @@ -1,6 +1,6 @@ # Managed by copier — changes may be overwritten by `copier update` name: Nix Setup -description: Install Nix and enable magic-nix-cache +description: Install Nix with Determinate Systems installer inputs: nix-extra-conf: @@ -17,6 +17,3 @@ runs: eval-cores = 1 ${{ inputs.nix-extra-conf }} diagnostic-endpoint: "" - - uses: DeterminateSystems/magic-nix-cache-action@565684385bcd71bad329742eefe8d12f2e765b39 # v13 - with: - diagnostic-endpoint: "" diff --git a/.github/renovate.json b/.github/renovate.json index 6881547..bcea55c 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -32,11 +32,6 @@ "matchUpdateTypes": ["major"], "groupName": "major dependencies", "groupSlug": "major" - }, - { - "matchManagers": ["github-actions"], - "matchFileNames": ["template/**"], - "enabled": false } ] } diff --git a/template/.github/actions/nix-setup/action.yaml b/template/.github/actions/nix-setup/action.yaml index 6de0e03..04b2f0f 100644 --- a/template/.github/actions/nix-setup/action.yaml +++ b/template/.github/actions/nix-setup/action.yaml @@ -1,6 +1,6 @@ # Managed by copier — changes may be overwritten by `copier update` name: Nix Setup -description: Install Nix and enable magic-nix-cache +description: Install Nix with Determinate Systems installer inputs: nix-extra-conf: @@ -17,6 +17,3 @@ runs: eval-cores = 1 ${{ inputs.nix-extra-conf }} diagnostic-endpoint: "" - - uses: DeterminateSystems/magic-nix-cache-action@565684385bcd71bad329742eefe8d12f2e765b39 # v13 - with: - diagnostic-endpoint: "" diff --git a/template/.github/renovate.json.jinja b/template/.github/renovate.json.jinja index 5a803f9..8b28302 100644 --- a/template/.github/renovate.json.jinja +++ b/template/.github/renovate.json.jinja @@ -19,13 +19,6 @@ "matchUpdateTypes": ["major"], "groupName": "major dependencies", "groupSlug": "major" - }{{ ',' if _is_template else '' }} -{% if _is_template %} - { - "matchManagers": ["github-actions"], - "matchFileNames": ["template/**"], - "enabled": false } -{% endif %} ] } diff --git a/tests/test_rendering.py b/tests/test_rendering.py index a6962e6..11bcb06 100644 --- a/tests/test_rendering.py +++ b/tests/test_rendering.py @@ -287,16 +287,6 @@ def test_renovate_has_template_config(generated_template_project): assert template_managers, "No template-specific customManagers found" -def test_renovate_template_suppresses_builtin_gha(generated_template_project): - """Template repo disables built-in github-actions manager for template paths.""" - data = parse_json(generated_template_project / ".github" / "renovate.json") - rules = data.get("packageRules", []) - gha_rule = [r for r in rules if r.get("matchManagers") == ["github-actions"]] - assert gha_rule, "No packageRule suppressing github-actions for template paths" - assert gha_rule[0].get("matchFileNames") == ["template/**"] - assert gha_rule[0].get("enabled") is False - - def test_no_consistency_job_default(generated_github_project): """Default projects have no consistency job in pr-checks.""" assert "consistency" not in (generated_github_project / ".github" / "workflows" / "pr-checks.yaml").read_text()