Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/actions/nix-setup/action.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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: ""
5 changes: 0 additions & 5 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@
"matchUpdateTypes": ["major"],
"groupName": "major dependencies",
"groupSlug": "major"
},
{
"matchManagers": ["github-actions"],
"matchFileNames": ["template/**"],
"enabled": false
}
]
}
5 changes: 1 addition & 4 deletions template/.github/actions/nix-setup/action.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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: ""
7 changes: 0 additions & 7 deletions template/.github/renovate.json.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
]
}
10 changes: 0 additions & 10 deletions tests/test_rendering.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading