From 9d999625753d88d7fdb255f1570781f9b8855fa3 Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Mon, 23 Oct 2023 02:11:35 +0000 Subject: [PATCH 1/4] format/now -> develop/now --- .gitea/workflows/format->develop.yml | 2 +- .gitea/workflows/tag->deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/format->develop.yml b/.gitea/workflows/format->develop.yml index bd9c285..355055c 100644 --- a/.gitea/workflows/format->develop.yml +++ b/.gitea/workflows/format->develop.yml @@ -31,7 +31,7 @@ jobs: git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned git -C ../cloned fetch origin #--depth=1 git -C ../cloned branch -r - git -C ../cloned switch $DEVELOPMENT_BRANCH + git -C ../cloned checkout -b $DEVELOPMENT_BRANCH mv ../cloned/.git .. rm -rf ../cloned cp -r . ../cloned diff --git a/.gitea/workflows/tag->deploy.yml b/.gitea/workflows/tag->deploy.yml index c76cffd..24f6d16 100644 --- a/.gitea/workflows/tag->deploy.yml +++ b/.gitea/workflows/tag->deploy.yml @@ -31,4 +31,4 @@ jobs: git config --global user.email "username@users.noreply.github.com" git add -A git commit -a -m "${{ github.ref_name }} -> refs/heads/deployed/${{ github.ref_name }} " - git push origin HEAD:refs/heads/deployed-${{ github.ref_name }} + git push origin HEAD:refs/heads/deployed/${{ github.ref_name }} From 8c49f138dd6aaffafa5882ae44c38f8679d7b948 Mon Sep 17 00:00:00 2001 From: giles Date: Mon, 23 Oct 2023 02:12:14 +0000 Subject: [PATCH 2/4] Update instructions/instruction.htm --- instructions/instruction.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instructions/instruction.htm b/instructions/instruction.htm index 22efbe7..e4aaa63 100644 --- a/instructions/instruction.htm +++ b/instructions/instruction.htm @@ -1 +1 @@ -DO SOMETHING! +DO SOMETHING!s From e6f3f3dc5ca97139a061f2f09b05969205fc57cc Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Mon, 23 Oct 2023 02:13:27 +0000 Subject: [PATCH 3/4] format/now -> develop/now --- .gitea/workflows/format->develop.yml | 2 +- instructions/instruction.htm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/format->develop.yml b/.gitea/workflows/format->develop.yml index 355055c..bd9c285 100644 --- a/.gitea/workflows/format->develop.yml +++ b/.gitea/workflows/format->develop.yml @@ -31,7 +31,7 @@ jobs: git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned git -C ../cloned fetch origin #--depth=1 git -C ../cloned branch -r - git -C ../cloned checkout -b $DEVELOPMENT_BRANCH + git -C ../cloned switch $DEVELOPMENT_BRANCH mv ../cloned/.git .. rm -rf ../cloned cp -r . ../cloned diff --git a/instructions/instruction.htm b/instructions/instruction.htm index e4aaa63..22efbe7 100644 --- a/instructions/instruction.htm +++ b/instructions/instruction.htm @@ -1 +1 @@ -DO SOMETHING!s +DO SOMETHING! From 9f7b5c781efec9b6a1e317a148811d4808ebb64b Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Mon, 23 Oct 2023 02:15:33 +0000 Subject: [PATCH 4/4] format/now -> develop/now --- .gitea/workflows/format->develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/format->develop.yml b/.gitea/workflows/format->develop.yml index bd9c285..1820e2f 100644 --- a/.gitea/workflows/format->develop.yml +++ b/.gitea/workflows/format->develop.yml @@ -31,7 +31,7 @@ jobs: git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned git -C ../cloned fetch origin #--depth=1 git -C ../cloned branch -r - git -C ../cloned switch $DEVELOPMENT_BRANCH + git -C ../cloned switch $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH mv ../cloned/.git .. rm -rf ../cloned cp -r . ../cloned