From 092bd3ecd9518d414f14fc23d279601bddb85b77 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 1 Apr 2025 17:15:27 -0400 Subject: [PATCH 1/2] fix: remove [skip ci] edge condition this was causing issues with our nightly tagging. --- .github/workflows/mirror-repos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mirror-repos.yml b/.github/workflows/mirror-repos.yml index 947c8b5080f7..e351fc7d6927 100644 --- a/.github/workflows/mirror-repos.yml +++ b/.github/workflows/mirror-repos.yml @@ -77,7 +77,7 @@ jobs: for nargo_file in $nargo_files; do git restore --source=origin/master -- $nargo_file done - git commit --all --amend -m "$(git log -1 --pretty=%B) [skip ci]" + git commit --all --amend -m "$(git log -1 --pretty=%B)" git push fi From 1d9594160b07745bcdb9f9e2c0b64249ab09b979 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 1 Apr 2025 17:16:31 -0400 Subject: [PATCH 2/2] Update fix_subrepo_edge_case.sh --- scripts/fix_subrepo_edge_case.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/fix_subrepo_edge_case.sh b/scripts/fix_subrepo_edge_case.sh index bf0d1601e8bf..6888875eaff6 100755 --- a/scripts/fix_subrepo_edge_case.sh +++ b/scripts/fix_subrepo_edge_case.sh @@ -22,4 +22,4 @@ git config --file="$SUBREPO_PATH/.gitrepo" subrepo.parent $new_parent # Commit this change git add "$SUBREPO_PATH/.gitrepo" # This commit should only go into squashed PRs -git commit -m "git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]" +git commit -m "git_subrepo.sh: Fix parent in .gitrepo file."