From 971094cdc667b75bd9774846c08c1703186abb04 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Fri, 4 Apr 2025 18:58:24 +0400 Subject: [PATCH 1/3] Move to GitFlow strategy --- .github/workflows/testing.yml | 67 ++++--------------------- .github/workflows/version-increment.yml | 58 +++++++++++++++++++++ dist/benchmark | 2 +- dist/googletest | 2 +- dist/pog | 2 +- 5 files changed, 70 insertions(+), 61 deletions(-) create mode 100644 .github/workflows/version-increment.yml diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index ab40bdf3..219cfb21 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -1,17 +1,14 @@ name: HyperCPU CI/CD Pipeline on: - push: - branches: - - dev pull_request: branches: - - dev + - master jobs: testing: runs-on: self-hosted - if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'ci force push')" + name: Run full test suite steps: - name: Checkout code @@ -22,12 +19,6 @@ jobs: - name: Pull submodules run: | git submodule update --init --remote --recursive - - - name: Install all tools - uses: aminya/setup-cpp@v1 - with: - cmake: true - cppcheck: true - name: Install GTest Parallelizer run: | @@ -67,8 +58,7 @@ jobs: versioning-patch-increment: runs-on: self-hosted - if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'ci force push') && !contains(github.event.head_commit.message, 'minor')" - needs: [testing] + if: "contains(github.event.head_commit.message, '[ci patch inc]')" permissions: contents: write @@ -78,7 +68,6 @@ jobs: with: fetch-depth: '0' - - name: Setup git user uses: fregante/setup-git-user@v1 @@ -88,21 +77,13 @@ jobs: - name: Push changes to master branch run: | - git checkout dev - git switch dev - MSG=$(git log -1 --pretty=%B | more) - git reset --soft HEAD~1 git add . - git commit -m "$MSG" - git push origin dev -f - git merge -s ours origin/master - git checkout master - git reset --hard dev - git push origin master -f + git commit -m "[auto]: Increment patch version" + git push origin master versioning-minor-increment: runs-on: self-hosted - if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'ci force push') && contains(github.event.head_commit.message, 'minor')" + if: "contains(github.event.head_commit.message, '[ci minor inc]')" needs: [testing] permissions: contents: write @@ -113,7 +94,6 @@ jobs: with: fetch-depth: '0' - - name: Setup git user uses: fregante/setup-git-user@v1 @@ -123,36 +103,7 @@ jobs: - name: Push changes to master branch run: | - git checkout dev - git switch dev - MSG=$(git log -1 --pretty=%B | more) - git reset --soft HEAD~1 git add . - git commit -m "$MSG" - git push origin dev -f - git merge -s ours origin/master - git checkout master - git reset --hard dev - git push origin master -f - - sync-no-update: - runs-on: self-hosted - if: "contains(github.event.head_commit.message, 'ci force push')" - permissions: - contents: write - - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: '0' - - - - name: Setup git user - uses: fregante/setup-git-user@v1 - - - name: Push changes to master branch - run: | - git checkout master - git reset --hard dev - git push origin master -f + git commit -m "[auto]: Increment patch version" + git push origin master + \ No newline at end of file diff --git a/.github/workflows/version-increment.yml b/.github/workflows/version-increment.yml new file mode 100644 index 00000000..94339b73 --- /dev/null +++ b/.github/workflows/version-increment.yml @@ -0,0 +1,58 @@ +name: HyperCPU CI/CD Pipeline (version incrementing) + +on: + push: + branches: + - master + +jobs: + versioning-patch-increment: + runs-on: self-hosted + if: "contains(github.event.head_commit.message, '[ci patch inc]')" + permissions: + contents: write + + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: '0' + + - name: Setup git user + uses: fregante/setup-git-user@v1 + + - name: Increment version + run: | + scripts/increment_patch.sh + + - name: Push changes to master branch + run: | + git add . + git commit -m "[auto]: Increment patch version" + git push origin master + + versioning-minor-increment: + runs-on: self-hosted + if: "contains(github.event.head_commit.message, '[ci minor inc]')" + permissions: + contents: write + + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: '0' + + - name: Setup git user + uses: fregante/setup-git-user@v1 + + - name: Increment version + run: | + scripts/increment_minor.sh + + - name: Push changes to master branch + run: | + git add . + git commit -m "[auto]: Increment patch version" + git push origin master + \ No newline at end of file diff --git a/dist/benchmark b/dist/benchmark index 0da57b85..1bc59dce 160000 --- a/dist/benchmark +++ b/dist/benchmark @@ -1 +1 @@ -Subproject commit 0da57b85cf23e48d0e515f58c65a25425dbde012 +Subproject commit 1bc59dce278b9145f18ef88d31d373c4ba939dc4 diff --git a/dist/googletest b/dist/googletest index 52204f78..2b6b042a 160000 --- a/dist/googletest +++ b/dist/googletest @@ -1 +1 @@ -Subproject commit 52204f78f94d7512df1f0f3bea1d47437a2c3a58 +Subproject commit 2b6b042a77446ff322cd7522ca068d9f2a21c1d1 diff --git a/dist/pog b/dist/pog index d62f0d05..d2673b7a 160000 --- a/dist/pog +++ b/dist/pog @@ -1 +1 @@ -Subproject commit d62f0d05c1cbb638ef2d4d37084ab8b54e3bfc29 +Subproject commit d2673b7a269bc37db1810726466de0d6294ba911 From 2501e7414bb8468cd8ca9675ab315d6d02ba14df Mon Sep 17 00:00:00 2001 From: HyperWin <92534013+HyperWinX@users.noreply.github.com> Date: Fri, 4 Apr 2025 19:59:14 +0400 Subject: [PATCH 2/3] Update testing.yml --- .github/workflows/testing.yml | 52 ----------------------------------- 1 file changed, 52 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 219cfb21..9530b53a 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -55,55 +55,3 @@ jobs: ../gtest-parallel/gtest-parallel build/modular_testing --workers=4 ../gtest-parallel/gtest-parallel build/integration_testing --workers=4 rm -rf build - - versioning-patch-increment: - runs-on: self-hosted - if: "contains(github.event.head_commit.message, '[ci patch inc]')" - permissions: - contents: write - - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: '0' - - - name: Setup git user - uses: fregante/setup-git-user@v1 - - - name: Increment version - run: | - scripts/increment_patch.sh - - - name: Push changes to master branch - run: | - git add . - git commit -m "[auto]: Increment patch version" - git push origin master - - versioning-minor-increment: - runs-on: self-hosted - if: "contains(github.event.head_commit.message, '[ci minor inc]')" - needs: [testing] - permissions: - contents: write - - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: '0' - - - name: Setup git user - uses: fregante/setup-git-user@v1 - - - name: Increment version - run: | - scripts/increment_minor.sh - - - name: Push changes to master branch - run: | - git add . - git commit -m "[auto]: Increment patch version" - git push origin master - \ No newline at end of file From 78c2076b6d5c39d252b1e8ab36a034a9a67c820b Mon Sep 17 00:00:00 2001 From: HyperWin <92534013+HyperWinX@users.noreply.github.com> Date: Fri, 4 Apr 2025 19:59:40 +0400 Subject: [PATCH 3/3] Update version-increment.yml --- .github/workflows/version-increment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/version-increment.yml b/.github/workflows/version-increment.yml index 94339b73..686b3b4c 100644 --- a/.github/workflows/version-increment.yml +++ b/.github/workflows/version-increment.yml @@ -53,6 +53,6 @@ jobs: - name: Push changes to master branch run: | git add . - git commit -m "[auto]: Increment patch version" + git commit -m "[auto]: Increment minor version" git push origin master \ No newline at end of file