From c9cd8ad8ff6a27280954bd6753652618a5627b0d Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 16:49:32 -0600 Subject: [PATCH 1/9] Beta files test --- .github/workflows/build-beta.yml | 9 +++++++++ beta/beta-pr.yml | 16 ++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml index 75409a4a..8c9e254f 100644 --- a/.github/workflows/build-beta.yml +++ b/.github/workflows/build-beta.yml @@ -32,6 +32,15 @@ jobs: npm install NODE_ENV=production NODE_OPTIONS=--loader=ts-node/esm webpack --mode production + - name: Beta Files + run : | + rm -rf docs/index.html docs/404.html docs/CNAME .github + mkdir .github .github/workflows + mv beta/beta-compile.yml beta/beta-pr.yml .github/workflows/ + mv beta/index.html beta/404.html beta/CNAME docs/ + git add . + git commit -am "Beta Files" + - name: Push Beta run: | git config user.name "chiefmikey" diff --git a/beta/beta-pr.yml b/beta/beta-pr.yml index b9436d65..74ff5234 100644 --- a/beta/beta-pr.yml +++ b/beta/beta-pr.yml @@ -34,14 +34,14 @@ jobs: git add . git commit -am "Beta Merge" - - name: Beta Files - run : | - rm -rf docs/index.html docs/404.html docs/CNAME .github - mkdir .github .github/workflows - mv beta/beta-compile.yml beta/beta-pr.yml .github/workflows/ - mv beta/index.html beta/404.html beta/CNAME docs/ - git add . - git commit -am "Beta Files" + # - name: Beta Files + # run : | + # rm -rf docs/index.html docs/404.html docs/CNAME .github + # mkdir .github .github/workflows + # mv beta/beta-compile.yml beta/beta-pr.yml .github/workflows/ + # mv beta/index.html beta/404.html beta/CNAME docs/ + # git add . + # git commit -am "Beta Files" - name: Delete Branches run: | From a850df994c70baa8832b87f8b7d1e523b4d68726 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 17:27:53 -0600 Subject: [PATCH 2/9] Update beta push --- .github/workflows/build-beta.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml index 8c9e254f..14c907b0 100644 --- a/.github/workflows/build-beta.yml +++ b/.github/workflows/build-beta.yml @@ -35,18 +35,23 @@ jobs: - name: Beta Files run : | rm -rf docs/index.html docs/404.html docs/CNAME .github - mkdir .github .github/workflows - mv beta/beta-compile.yml beta/beta-pr.yml .github/workflows/ mv beta/index.html beta/404.html beta/CNAME docs/ git add . git commit -am "Beta Files" - - name: Push Beta + - name: Push Main run: | git config user.name "chiefmikey" git config user.email "wolfemikl@gmail.com" - BRANCH=${{ github.head_ref }} git remote set-url --add --push origin https://github.com/chiefmikey/gitlang-beta.git - git reset $(git commit-tree HEAD^{tree} -m 'Beta Branch') - git push -fu origin HEAD:refs/heads/${BRANCH} + git reset $(git commit-tree HEAD^{tree} -m 'Beta Build') + git push -fu origin HEAD:main echo "https://beta.gitlang.net" + + # - name: Push Branch + # run: | + # BRANCH=${{ github.head_ref }} + # git remote set-url --add --push origin https://github.com/chiefmikey/gitlang-beta.git + # git reset $(git commit-tree HEAD^{tree} -m 'Beta Branch') + # git push -fu origin HEAD:refs/heads/${BRANCH} + # echo "https://beta.gitlang.net" From 9377c3356587ed0124df4580619a359b6103f5bf Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 17:28:40 -0600 Subject: [PATCH 3/9] Keep references --- .github/workflows/build-beta.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml index 14c907b0..e79a77f3 100644 --- a/.github/workflows/build-beta.yml +++ b/.github/workflows/build-beta.yml @@ -35,6 +35,8 @@ jobs: - name: Beta Files run : | rm -rf docs/index.html docs/404.html docs/CNAME .github + # mkdir .github .github/workflows + # mv beta/beta-compile.yml beta/beta-pr.yml .github/workflows/ mv beta/index.html beta/404.html beta/CNAME docs/ git add . git commit -am "Beta Files" From 8484e98c812af42335111c1897911f53ccc30a83 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 17:30:43 -0600 Subject: [PATCH 4/9] Add git creds --- .github/workflows/build-beta.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml index e79a77f3..98930c65 100644 --- a/.github/workflows/build-beta.yml +++ b/.github/workflows/build-beta.yml @@ -34,6 +34,8 @@ jobs: - name: Beta Files run : | + git config user.name "chiefmikey" + git config user.email "wolfemikl@gmail.com" rm -rf docs/index.html docs/404.html docs/CNAME .github # mkdir .github .github/workflows # mv beta/beta-compile.yml beta/beta-pr.yml .github/workflows/ @@ -43,8 +45,6 @@ jobs: - name: Push Main run: | - git config user.name "chiefmikey" - git config user.email "wolfemikl@gmail.com" git remote set-url --add --push origin https://github.com/chiefmikey/gitlang-beta.git git reset $(git commit-tree HEAD^{tree} -m 'Beta Build') git push -fu origin HEAD:main From ee96fa4f4e810aa5ec6cb11edf43e30a53e7ed30 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 17:32:51 -0600 Subject: [PATCH 5/9] Update commit to branch name --- .github/workflows/build-beta.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml index 98930c65..5d9b74cf 100644 --- a/.github/workflows/build-beta.yml +++ b/.github/workflows/build-beta.yml @@ -34,6 +34,7 @@ jobs: - name: Beta Files run : | + BRANCH=${{ github.head_ref }} git config user.name "chiefmikey" git config user.email "wolfemikl@gmail.com" rm -rf docs/index.html docs/404.html docs/CNAME .github @@ -41,12 +42,12 @@ jobs: # mv beta/beta-compile.yml beta/beta-pr.yml .github/workflows/ mv beta/index.html beta/404.html beta/CNAME docs/ git add . - git commit -am "Beta Files" + git commit -am "${BRANCH}" - name: Push Main run: | git remote set-url --add --push origin https://github.com/chiefmikey/gitlang-beta.git - git reset $(git commit-tree HEAD^{tree} -m 'Beta Build') + git reset $(git commit-tree HEAD^{tree} -m "${BRANCH}") git push -fu origin HEAD:main echo "https://beta.gitlang.net" From 732973c3ba9b89e4a75dfdfbceb2e7e9f015ec70 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 17:33:59 -0600 Subject: [PATCH 6/9] Update beta workflows dir --- .github/workflows/build-beta.yml | 2 +- beta/{ => workflows}/beta-compile.yml | 0 beta/{ => workflows}/beta-pr.yml | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename beta/{ => workflows}/beta-compile.yml (100%) rename beta/{ => workflows}/beta-pr.yml (100%) diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml index 5d9b74cf..969db5cd 100644 --- a/.github/workflows/build-beta.yml +++ b/.github/workflows/build-beta.yml @@ -39,7 +39,7 @@ jobs: git config user.email "wolfemikl@gmail.com" rm -rf docs/index.html docs/404.html docs/CNAME .github # mkdir .github .github/workflows - # mv beta/beta-compile.yml beta/beta-pr.yml .github/workflows/ + # mv beta/workflows/beta-compile.yml beta/workflows/beta-pr.yml .github/workflows/ mv beta/index.html beta/404.html beta/CNAME docs/ git add . git commit -am "${BRANCH}" diff --git a/beta/beta-compile.yml b/beta/workflows/beta-compile.yml similarity index 100% rename from beta/beta-compile.yml rename to beta/workflows/beta-compile.yml diff --git a/beta/beta-pr.yml b/beta/workflows/beta-pr.yml similarity index 100% rename from beta/beta-pr.yml rename to beta/workflows/beta-pr.yml From 232e137e800ebd2be5be170beef524df092be5e0 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 17:40:12 -0600 Subject: [PATCH 7/9] Update branch name variable --- .github/workflows/build-beta.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml index 969db5cd..ce267431 100644 --- a/.github/workflows/build-beta.yml +++ b/.github/workflows/build-beta.yml @@ -46,6 +46,7 @@ jobs: - name: Push Main run: | + BRANCH=${{ github.head_ref }} git remote set-url --add --push origin https://github.com/chiefmikey/gitlang-beta.git git reset $(git commit-tree HEAD^{tree} -m "${BRANCH}") git push -fu origin HEAD:main From 2b6b4074472e2f9379ecaf2fe6097b52abaed9e5 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 17:41:41 -0600 Subject: [PATCH 8/9] Update sonarcloud workflow to run on pull request only --- .github/workflows/sonarcloud.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index b45aab95..99648e83 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -1,7 +1,6 @@ name: SonarCloud Analysis on: - push: pull_request: permissions: From e7c4648c340c123e1ad48007a69963937b539e5a Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 17:44:28 -0600 Subject: [PATCH 9/9] Update message to PR title --- .github/workflows/build-beta.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml index ce267431..9a11afe1 100644 --- a/.github/workflows/build-beta.yml +++ b/.github/workflows/build-beta.yml @@ -46,9 +46,9 @@ jobs: - name: Push Main run: | - BRANCH=${{ github.head_ref }} + PR_TITLE=${{ github.event.pull_request.title }} git remote set-url --add --push origin https://github.com/chiefmikey/gitlang-beta.git - git reset $(git commit-tree HEAD^{tree} -m "${BRANCH}") + git reset $(git commit-tree HEAD^{tree} -m "${PR_TITLE}") git push -fu origin HEAD:main echo "https://beta.gitlang.net"