From 1c714a12622c91b6db7e7d9220097d0919b756dd Mon Sep 17 00:00:00 2001 From: witmicko Date: Wed, 29 Nov 2023 12:58:27 +0000 Subject: [PATCH 1/7] gh action for backport release --- .github/workflows/main.yml | 2 +- .github/workflows/publish-main-gh-pages.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c9423c2..04769ba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,7 +2,7 @@ name: Main on: push: - branches: [main] + branches: [main2] pull_request: jobs: diff --git a/.github/workflows/publish-main-gh-pages.yml b/.github/workflows/publish-main-gh-pages.yml index 97462dc..0942184 100644 --- a/.github/workflows/publish-main-gh-pages.yml +++ b/.github/workflows/publish-main-gh-pages.yml @@ -2,7 +2,7 @@ name: Publish main branch to GitHub Pages on: push: - branches: main + branches: main2 jobs: publish-to-gh-pages: From 925d7d4482955d2520cd2f3f3240e68c39858633 Mon Sep 17 00:00:00 2001 From: witmicko Date: Wed, 29 Nov 2023 14:48:13 +0000 Subject: [PATCH 2/7] gh action for backport relase --- ....yml => publish-gh-pages-backport-2.1.yml} | 12 ++-- .../publish-gh-pages-backport-pre-2.1.yml | 63 +++++++++++++++++++ 2 files changed, 69 insertions(+), 6 deletions(-) rename .github/workflows/{publish-gh-pages-backport.yml => publish-gh-pages-backport-2.1.yml} (81%) create mode 100644 .github/workflows/publish-gh-pages-backport-pre-2.1.yml diff --git a/.github/workflows/publish-gh-pages-backport.yml b/.github/workflows/publish-gh-pages-backport-2.1.yml similarity index 81% rename from .github/workflows/publish-gh-pages-backport.yml rename to .github/workflows/publish-gh-pages-backport-2.1.yml index a99baa5..a3764bc 100644 --- a/.github/workflows/publish-gh-pages-backport.yml +++ b/.github/workflows/publish-gh-pages-backport-2.1.yml @@ -1,7 +1,7 @@ name: Publish Backport GitHub Pages # This workflow can be used to backport a release from a tag to the gh-pages branch # This is useful when you want to backport a release to the gh-pages branch -# Most likely you will want to check and update BASE_REF and VERSIONS env variables +# It is hardcoded for versions v2.1.0 # @BASE_REF: the tag you want to backport from # @VERSIONS: the versions you want to backport to @@ -54,10 +54,10 @@ jobs: git config user.email "<>" git status git remote --verbose - git branch -D gh-pages-backport || true - git checkout -b gh-pages-backport + git branch -D gh-pages-backport-2.1 || true + git checkout -b gh-pages-backport-2.1 git add . git commit -m "Update gh-pages" - git push origin gh-pages-backport -f - echo "Pushed build changes to gh-pages-backport" - echo "REMEMBER TO CREATE A PR FROM gh-pages-backport TO gh-pages" + git push origin gh-pages-backport-2.1 -f + echo "Pushed build changes to gh-pages-backport-2.1" + echo "REMEMBER TO CREATE A PR FROM gh-pages-backport-2.1 TO gh-pages" diff --git a/.github/workflows/publish-gh-pages-backport-pre-2.1.yml b/.github/workflows/publish-gh-pages-backport-pre-2.1.yml new file mode 100644 index 0000000..fcce5f7 --- /dev/null +++ b/.github/workflows/publish-gh-pages-backport-pre-2.1.yml @@ -0,0 +1,63 @@ +name: Publish Backport GitHub Pages +# This workflow can be used to backport a release from a tag to the gh-pages branch +# This is useful when you want to backport a release to the gh-pages branch +# It is hardcoded for versions " + git status + git remote --verbose + git branch -D gh-pages-backport-pre-2.1.0 || true + git checkout -b gh-pages-backport-pre-2.1.0 + git add . + git commit -m "Update gh-pages" + git push origin gh-pages-backport-pre-2.1.0 -f + echo "Pushed build changes to gh-pages-backport-pre-2.1.0" + echo "REMEMBER TO CREATE A PR FROM gh-pages-backport-pre-2.1.0 TO gh-pages" From ca179c58fd3d8b29b238119a28e458e8c00ca594 Mon Sep 17 00:00:00 2001 From: witmicko Date: Wed, 29 Nov 2023 14:49:22 +0000 Subject: [PATCH 3/7] gh action for backport relase --- .github/workflows/main.yml | 2 +- .github/workflows/publish-main-gh-pages.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 04769ba..c9423c2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,7 +2,7 @@ name: Main on: push: - branches: [main2] + branches: [main] pull_request: jobs: diff --git a/.github/workflows/publish-main-gh-pages.yml b/.github/workflows/publish-main-gh-pages.yml index 0942184..97462dc 100644 --- a/.github/workflows/publish-main-gh-pages.yml +++ b/.github/workflows/publish-main-gh-pages.yml @@ -2,7 +2,7 @@ name: Publish main branch to GitHub Pages on: push: - branches: main2 + branches: main jobs: publish-to-gh-pages: From d49384af0be4494fb46f3437d842c28287237eea Mon Sep 17 00:00:00 2001 From: witmicko Date: Mon, 4 Dec 2023 10:43:01 +0000 Subject: [PATCH 4/7] gh action for backport relase --- .github/workflows/publish-gh-pages-backport-2.1.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-gh-pages-backport-2.1.yml b/.github/workflows/publish-gh-pages-backport-2.1.yml index a3764bc..682a666 100644 --- a/.github/workflows/publish-gh-pages-backport-2.1.yml +++ b/.github/workflows/publish-gh-pages-backport-2.1.yml @@ -9,8 +9,8 @@ on: workflow_dispatch: env: - BASE_REF: v2.1.0-with-backported-fixes - VERSIONS: v2.1.0 + BASE_REF: v2.0.1-with-backported-fixes + VERSIONS: v1.0.0,v1.1.0,v1.2.1,v1.2.2,v2.0.0,v2.0.1,v2.1.0 jobs: publish-to-gh-pages: name: Publish to GitHub Pages From cb6b5ffbda53ecce42c8fd5170954941d8c92820 Mon Sep 17 00:00:00 2001 From: witmicko Date: Tue, 5 Dec 2023 11:25:12 +0000 Subject: [PATCH 5/7] gh action for backport relase --- .github/workflows/publish-gh-pages-backport-2.1.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/publish-gh-pages-backport-2.1.yml b/.github/workflows/publish-gh-pages-backport-2.1.yml index 682a666..88db0ee 100644 --- a/.github/workflows/publish-gh-pages-backport-2.1.yml +++ b/.github/workflows/publish-gh-pages-backport-2.1.yml @@ -1,3 +1,9 @@ +# This workflow can be used to backport a release from a tag to the gh-pages branch +# This is useful when you want to backport a release to the gh-pages branch +# Most likely you will want to check and update BASE_REF and VERSIONS env variables +# @BASE_REF: the tag you want to backport from +# @VERSIONS: the versions you want to backport to + name: Publish Backport GitHub Pages # This workflow can be used to backport a release from a tag to the gh-pages branch # This is useful when you want to backport a release to the gh-pages branch From 6653786036ca31eae83c8246a21e9e308c1162bb Mon Sep 17 00:00:00 2001 From: witmicko Date: Mon, 18 Dec 2023 10:50:00 +0000 Subject: [PATCH 6/7] fix versions --- .../workflows/publish-gh-pages-backport-2.1.yml | 11 +++-------- .../publish-gh-pages-backport-pre-2.1.yml | 16 ++++++++-------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.github/workflows/publish-gh-pages-backport-2.1.yml b/.github/workflows/publish-gh-pages-backport-2.1.yml index 88db0ee..f0cfc15 100644 --- a/.github/workflows/publish-gh-pages-backport-2.1.yml +++ b/.github/workflows/publish-gh-pages-backport-2.1.yml @@ -1,22 +1,17 @@ # This workflow can be used to backport a release from a tag to the gh-pages branch # This is useful when you want to backport a release to the gh-pages branch -# Most likely you will want to check and update BASE_REF and VERSIONS env variables +# It is hardcoded for versions v2.1.0 # @BASE_REF: the tag you want to backport from # @VERSIONS: the versions you want to backport to name: Publish Backport GitHub Pages -# This workflow can be used to backport a release from a tag to the gh-pages branch -# This is useful when you want to backport a release to the gh-pages branch -# It is hardcoded for versions v2.1.0 -# @BASE_REF: the tag you want to backport from -# @VERSIONS: the versions you want to backport to on: workflow_dispatch: env: - BASE_REF: v2.0.1-with-backported-fixes - VERSIONS: v1.0.0,v1.1.0,v1.2.1,v1.2.2,v2.0.0,v2.0.1,v2.1.0 + BASE_REF: v2.1.0-with-backported-fixes + VERSIONS: v2.1.0 jobs: publish-to-gh-pages: name: Publish to GitHub Pages diff --git a/.github/workflows/publish-gh-pages-backport-pre-2.1.yml b/.github/workflows/publish-gh-pages-backport-pre-2.1.yml index fcce5f7..9d6066b 100644 --- a/.github/workflows/publish-gh-pages-backport-pre-2.1.yml +++ b/.github/workflows/publish-gh-pages-backport-pre-2.1.yml @@ -1,7 +1,7 @@ name: Publish Backport GitHub Pages # This workflow can be used to backport a release from a tag to the gh-pages branch # This is useful when you want to backport a release to the gh-pages branch -# It is hardcoded for versions " git status git remote --verbose - git branch -D gh-pages-backport-pre-2.1.0 || true - git checkout -b gh-pages-backport-pre-2.1.0 + git branch -D gh-pages-backport-2.0.1 || true + git checkout -b gh-pages-backport-2.0.1 git add . git commit -m "Update gh-pages" - git push origin gh-pages-backport-pre-2.1.0 -f - echo "Pushed build changes to gh-pages-backport-pre-2.1.0" - echo "REMEMBER TO CREATE A PR FROM gh-pages-backport-pre-2.1.0 TO gh-pages" + git push origin gh-pages-backport-2.0.1 -f + echo "Pushed build changes to gh-pages-backport-2.0.1" + echo "REMEMBER TO CREATE A PR FROM gh-pages-backport-2.0.1 TO gh-pages" From 35b5f3a673cb89b8253dbea78d13f3910f7fd5b0 Mon Sep 17 00:00:00 2001 From: witmicko Date: Mon, 18 Dec 2023 16:14:59 +0000 Subject: [PATCH 7/7] Update publish-gh-pages-backport-pre-2.1.yml rm bad version --- .github/workflows/publish-gh-pages-backport-pre-2.1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-gh-pages-backport-pre-2.1.yml b/.github/workflows/publish-gh-pages-backport-pre-2.1.yml index 9d6066b..c12bde6 100644 --- a/.github/workflows/publish-gh-pages-backport-pre-2.1.yml +++ b/.github/workflows/publish-gh-pages-backport-pre-2.1.yml @@ -10,7 +10,7 @@ on: env: BASE_REF: v2.0.1-with-backported-fixes - VERSIONS: v1.0.0,v1.1.0,v1.2.1,v1.2.2,v2.0.0,v2.0.1,v2.1.0 + VERSIONS: v1.0.0,v1.1.0,v1.2.1,v1.2.2,v2.0.0,v2.0.1 jobs: publish-to-gh-pages: name: Publish to GitHub Pages