From d47edfa8ab434359b9ecb9d26255593891bf1a48 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 07:34:39 -0600 Subject: [PATCH 1/4] Update author test --- beta/beta-branch.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index abd5ba1e..274e566d 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -31,22 +31,22 @@ jobs: git config user.email "wolfemikl@gmail.com" echo test first: $(git status) TEST=$(git log) - echo test first: ${TEST##*Author} + echo test first: ${TEST##Author*} git checkout main echo test main: $(git status) TEST=$(git log) - echo test main: ${TEST##*Author} + echo test main: ${TEST##Author*} git checkout -b beta-branch echo test beta-branch: $(git status) TEST=$(git log) - echo test beta-branch: ${TEST##*Author} + echo test beta-branch: ${TEST##Author*} git reset --soft ${BRANCH} echo test reset: $(git status) TEST=$(git log) - echo test reset: ${TEST##*Author} + echo test reset: ${TEST##Author*} git add . git commit -am 'Beta branch' echo test commit: $(git status) TEST=$(git log) - echo test commit: ${TEST##*Author} + echo test commit: ${TEST##Author*} gh pr create -R chiefmikey/gitlang-beta --title ${BRANCH} --body 'Beta branch' --base main --head beta-branch From 64e448ed605ef67f10e072704a1cc66e99458620 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 07:58:07 -0600 Subject: [PATCH 2/4] Fix author test output --- beta/beta-branch.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 274e566d..a24b1244 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -31,22 +31,22 @@ jobs: git config user.email "wolfemikl@gmail.com" echo test first: $(git status) TEST=$(git log) - echo test first: ${TEST##Author*} + echo test first: ${TEST#Author*} git checkout main echo test main: $(git status) TEST=$(git log) - echo test main: ${TEST##Author*} + echo test main: ${TEST#Author*} git checkout -b beta-branch echo test beta-branch: $(git status) TEST=$(git log) - echo test beta-branch: ${TEST##Author*} + echo test beta-branch: ${TEST#Author*} git reset --soft ${BRANCH} echo test reset: $(git status) TEST=$(git log) - echo test reset: ${TEST##Author*} + echo test reset: ${TEST#Author*} git add . git commit -am 'Beta branch' echo test commit: $(git status) TEST=$(git log) - echo test commit: ${TEST##Author*} + echo test commit: ${TEST#Author*} gh pr create -R chiefmikey/gitlang-beta --title ${BRANCH} --body 'Beta branch' --base main --head beta-branch From 82dc5ea74faf611a22bfc7ce02c0bc6e230e7b7b Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 08:01:53 -0600 Subject: [PATCH 3/4] Fix author test to %% --- beta/beta-branch.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index a24b1244..4f10915a 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -31,22 +31,22 @@ jobs: git config user.email "wolfemikl@gmail.com" echo test first: $(git status) TEST=$(git log) - echo test first: ${TEST#Author*} + echo test first: ${TEST%%Author*} git checkout main echo test main: $(git status) TEST=$(git log) - echo test main: ${TEST#Author*} + echo test main: ${TEST%%Author*} git checkout -b beta-branch echo test beta-branch: $(git status) TEST=$(git log) - echo test beta-branch: ${TEST#Author*} + echo test beta-branch: ${TEST%%Author*} git reset --soft ${BRANCH} echo test reset: $(git status) TEST=$(git log) - echo test reset: ${TEST#Author*} + echo test reset: ${TEST%%Author*} git add . git commit -am 'Beta branch' echo test commit: $(git status) TEST=$(git log) - echo test commit: ${TEST#Author*} + echo test commit: ${TEST%%Author*} gh pr create -R chiefmikey/gitlang-beta --title ${BRANCH} --body 'Beta branch' --base main --head beta-branch From 030d2f17cd937505481d90ef3e8ff56d8286101a Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 08:05:49 -0600 Subject: [PATCH 4/4] Add base test --- beta/beta-branch.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 4f10915a..2c8f169f 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -48,5 +48,8 @@ jobs: git commit -am 'Beta branch' echo test commit: $(git status) TEST=$(git log) - echo test commit: ${TEST%%Author*} + echo test head: ${TEST%%Author*} + git checkout main + TEST=$(git log) + echo test base: ${TEST%%Author*} gh pr create -R chiefmikey/gitlang-beta --title ${BRANCH} --body 'Beta branch' --base main --head beta-branch