Skip to content

Commit

Permalink
Deleting git global config... and testing the workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
Robertorosmaninho authored Sep 21, 2023
1 parent 0231722 commit 478beb2
Showing 1 changed file with 29 additions and 29 deletions.
58 changes: 29 additions & 29 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,41 @@ on:
push:
branches:
- 'develop'
- 'test-develop-workflow'
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:

version-bump:
name: 'Version Bump'
runs-on: ubuntu-20.04
steps:
- name: 'Check out code'
uses: actions/checkout@v3
with:
token: ${{ secrets.JENKINS_GITHUB_PAT }}
# fetch-depth 0 means deep clone the repo
fetch-depth: 0
- name: 'Update Version'
run: |
set -x
git config user.name devops
git config user.email [email protected]
git checkout -B master origin/master
old_develop="$(git merge-base origin/develop origin/master)"
new_develop="$(git rev-parse origin/develop)"
if git diff --exit-code ${old_develop} ${new_develop} -- package/version; then
git merge --no-edit origin/develop
./package/version.sh bump
else
git merge --no-edit --strategy-option=theirs origin/develop
fi
./package/version.sh sub
if git add --update && git commit --no-edit --allow-empty --message "Set Version: $(cat package/version)"; then
git push origin master
fi
# version-bump:
# name: 'Version Bump'
# runs-on: ubuntu-20.04
# steps:
# - name: 'Check out code'
# uses: actions/checkout@v3
# with:
# token: ${{ secrets.JENKINS_GITHUB_PAT }}
# # fetch-depth 0 means deep clone the repo
# fetch-depth: 0
# - name: 'Update Version'
# run: |
# set -x
# git config user.name devops
# git config user.email [email protected]
# git checkout -B master origin/master
# old_develop="$(git merge-base origin/develop origin/master)"
# new_develop="$(git rev-parse origin/develop)"
# if git diff --exit-code ${old_develop} ${new_develop} -- package/version; then
# git merge --no-edit origin/develop
# ./package/version.sh bump
# else
# git merge --no-edit --strategy-option=theirs origin/develop
# fi
# ./package/version.sh sub
# if git add --update && git commit --no-edit --allow-empty --message "Set Version: $(cat package/version)"; then
# git push origin master
# fi

post-performance-tests:
name: 'Performace Tests'
Expand Down Expand Up @@ -81,7 +82,6 @@ jobs:
- name: 'Getting Performance Tests Results'
run: |
set -euxo pipefail
docker exec -t k-posting-profiling-tests-${GITHUB_SHA} /bin/bash -c 'git config --global --add safe.directory /opt/workspace'
docker exec -t k-posting-profiling-tests-${GITHUB_SHA} /bin/bash -c 'python3 k-distribution/tests/profiling/post_results_to_develop.py'
- name: 'Posting Performance Tests Results'
run: |
Expand Down

0 comments on commit 478beb2

Please sign in to comment.