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
3 changes: 0 additions & 3 deletions .github/workflows/test-states.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ jobs:
chmod 644 srv/salt/keys/master/master.pem
chmod 644 srv/salt/keys/master/master.pub

- name: Create frontend network (macvlan in prod, bridge in CI)
run: docker network create frontend || true

- name: Test Salt states (ubuntu + rhel)
run: pytest tests/ -m "ubuntu or rhel"

Expand Down
3 changes: 3 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
x-minion-base: &minion-base
restart: "no"
privileged: true
dns:
- 1.1.1.1
- 1.0.0.1
networks:
- salt-net
depends_on:
Expand Down
9 changes: 7 additions & 2 deletions provisioning/common/dotfiles/.git_template/hooks/commit-msg
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ msg_file = sys.argv[1]
with open(msg_file, encoding="utf-8") as f:
msg = f.read()

# first line only (subject)
subject = msg.splitlines()[0].strip() if msg.strip() else ""
# find subject (first non-comment, non-empty line)
subject = ""
for line in msg.splitlines():
stripped = line.strip()
if stripped and not stripped.startswith("#"):
subject = stripped
break

# skip merge commits, fixup/squash
skip_prefixes = ("Merge ", "Revert ", "fixup!", "squash!")
Expand Down
Loading