From c4aab252e8f7452adf7761c11976f361592cf946 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 17 Apr 2025 22:00:32 +0000 Subject: [PATCH] Squashed '.ci/' changes from a3928364..15e4d1f5 15e4d1f5 ci: make work with main branch 3feaf6fa chore: migrate to main branch git-subtree-dir: .ci git-subtree-split: 15e4d1f589c8e055944b2a4b58a9a50728e245b4 --- README.md | 2 +- podman.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 689e5351..699dbe62 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ include .ci/podman.mk Add subtree to your project: ``` -git subtree add --prefix .ci https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash +git subtree add --prefix .ci https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git main --squash ``` diff --git a/podman.mk b/podman.mk index 94901104..ed5aa268 100644 --- a/podman.mk +++ b/podman.mk @@ -85,7 +85,7 @@ rm-image: ## some useful tasks during development ci-pull-upstream: ## pull latest shared .ci subtree - git subtree pull --prefix .ci ssh://git@git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash -m "Merge latest ci-tools-lib" + git subtree pull --prefix .ci ssh://git@git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git main --squash -m "Merge latest ci-tools-lib" create-repo: ## create new AWS ECR public repository aws ecr-public create-repository --repository-name $(IMAGE) --region $(REGION)