Skip to content

Move to GitFlow strategy [ci patch inc] #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HyperWinX merged 3 commits into from
Apr 4, 2025
Merged

Move to GitFlow strategy [ci patch inc] #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
971094c
Move to GitFlow strategy
HyperWinX Apr 4, 2025
2501e74
Update testing.yml
HyperWinX Apr 4, 2025
78c2076
Update version-increment.yml
HyperWinX Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 2 additions & 103 deletions .github/workflows/testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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: |
Expand Down Expand Up @@ -64,95 +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 skip') && !contains(github.event.head_commit.message, 'ci force push') && !contains(github.event.head_commit.message, 'minor')"
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_patch.sh

- 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

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')"
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 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
58 changes: 58 additions & 0 deletions .github/workflows/version-increment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Check warning

Code scanning / CodeQL

Unpinned tag for a non-immutable Action in workflow Medium

Unpinned 3rd party Action 'HyperCPU CI/CD Pipeline (version incrementing)' step
Uses Step
Loading
uses 'fregante/setup-git-user' with ref 'v1', not a pinned commit hash

- 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

Check warning

Code scanning / CodeQL

Unpinned tag for a non-immutable Action in workflow Medium

Unpinned 3rd party Action 'HyperCPU CI/CD Pipeline (version incrementing)' step
Uses Step
Loading
uses 'fregante/setup-git-user' with ref 'v1', not a pinned commit hash

- name: Increment version
run: |
scripts/increment_minor.sh

- name: Push changes to master branch
run: |
git add .
git commit -m "[auto]: Increment minor version"
git push origin master

2 changes: 1 addition & 1 deletion dist/benchmark
Open in desktop
Submodule benchmark updated 12 files
+1 −1 CMakeLists.txt
+1 −1 MODULE.bazel
+1 −1 bindings/python/google_benchmark/__init__.py
+0 −40 docs/user_guide.md
+10 −26 include/benchmark/benchmark.h
+0 −3 src/benchmark_api_internal.h
+0 −5 src/benchmark_register.cc
+20 −39 src/benchmark_runner.cc
+1 −2 src/benchmark_runner.h
+21 −3 src/thread_manager.h
+0 −3 test/CMakeLists.txt
+0 −174 test/manual_threading_test.cc
2 changes: 1 addition & 1 deletion dist/googletest
Open in desktop
Submodule googletest updated 47 files
+0 −14 BUILD.bazel
+2 −2 CMakeLists.txt
+2 −2 MODULE.bazel
+4 −7 README.md
+6 −5 WORKSPACE
+29 −47 ci/linux-presubmit.sh
+4 −7 ci/macos-presubmit.sh
+13 −25 ci/windows-presubmit.bat
+45 −59 docs/advanced.md
+13 −0 docs/faq.md
+6 −39 docs/gmock_cook_book.md
+1 −2 docs/reference/actions.md
+4 −7 docs/reference/matchers.md
+1 −98 docs/reference/testing.md
+6 −27 googlemock/include/gmock/gmock-actions.h
+20 −198 googlemock/include/gmock/gmock-matchers.h
+5 −4 googlemock/include/gmock/gmock-more-actions.h
+5 −0 googlemock/include/gmock/internal/gmock-internal-utils.h
+3 −3 googlemock/test/gmock-actions_test.cc
+0 −183 googlemock/test/gmock-matchers-arithmetic_test.cc
+11 −302 googlemock/test/gmock-matchers-containers_test.cc
+10 −39 googlemock/test/gmock-more-actions_test.cc
+4 −3 googlemock/test/gmock-spec-builders_test.cc
+1 −1 googletest/README.md
+1 −1 googletest/cmake/internal_utils.cmake
+0 −7 googletest/include/gtest/gtest-assertion-result.h
+39 −95 googletest/include/gtest/gtest-param-test.h
+65 −61 googletest/include/gtest/gtest-typed-test.h
+2 −2 googletest/include/gtest/gtest.h
+23 −27 googletest/include/gtest/internal/gtest-internal.h
+14 −48 googletest/include/gtest/internal/gtest-param-util.h
+64 −2 googletest/include/gtest/internal/gtest-port.h
+0 −4 googletest/src/gtest-internal-inl.h
+27 −97 googletest/src/gtest.cc
+17 −51 googletest/test/BUILD.bazel
+0 −38 googletest/test/googletest-fail-if-no-test-linked-test-with-disabled-test_.cc
+0 −38 googletest/test/googletest-fail-if-no-test-linked-test-with-enabled-test_.cc
+0 −169 googletest/test/googletest-fail-if-no-test-linked-test.py
+0 −19 googletest/test/googletest-filter-unittest.py
+17 −19 googletest/test/googletest-json-output-unittest.py
+0 −70 googletest/test/googletest-param-test-test.cc
+1 −7 googletest/test/googletest-printers-test.cc
+2 −2 googletest/test/googletest-setuptestsuite-test_.cc
+4 −3 googletest/test/gtest_unittest.cc
+43 −45 googletest/test/gtest_xml_output_unittest.py
+1 −5 googletest/test/gtest_xml_output_unittest_.cc
+3 −3 googletest_deps.bzl
2 changes: 1 addition & 1 deletion dist/pog
Open in desktop
Submodule pog updated from d62f0d to d2673b
Loading