diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 02b28d6..cf964e3 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -10,6 +10,7 @@ jobs: LOG_TO_CS: ./logToCs.py RAW_LOG: pre-commit.log CS_XML: pre-commit.xml + SKIP: no-commit-to-branch steps: - run: sudo apt-get update && sudo apt-get install cppcheck if: false @@ -36,7 +37,7 @@ jobs: run: | python ${LOG_TO_CS} ${RAW_LOG} ${CS_XML} - name: Convert Raw Log to Checkstyle format (launch action) - uses: mdeweerd/.3.2 + uses: mdeweerd/logToCheckStyle@v2024.3.2 if: ${{ failure() }} with: in: ${{ env.RAW_LOG }} diff --git a/README.md b/README.md index e65e692..0fe9860 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ optional arguments: ```yaml - name: Convert Raw Log to Checkstyle format (launch action) - uses: mdeweerd/.3.2 + uses: mdeweerd/logToCheckStyle@v2024.3.2 if: ${{ failure() }} with: in: ${{ env.RAW_LOG }} diff --git a/tagMe b/tagMe index be6a27b..da82d7f 100644 --- a/tagMe +++ b/tagMe @@ -7,7 +7,7 @@ if [ "$TAG" != "" ] ; then FILES+=( README.md ) fi # Update the version and tag - perl -i -p -e 's/(logToCheckStyle\@).*/$1'"$TAG"'/' "${FILES[@]}" \ + perl -i -p -e 's/(?<=logToCheckStyle\@).*/'"$TAG"'/' "${FILES[@]}" \ && git add "${FILES[@]}" \ && git commit --no-verify --fixup HEAD \ && git rebase --no-verify -i --autosquash HEAD~2 @@ -19,7 +19,9 @@ grep "$TAG" README.md \ sourceBranch=$(git symbolic-ref HEAD | cut -d "/" -f 3-); targetBranch="test_branch"; git checkout $targetBranch \ + && git pull \ + && perl -i -p -e 's/(?<=logToCheckStyle\@).*/'"$TAG"'/' "${FILES[@]}" \ && git rebase --onto $sourceBranch \ - && git push \ + && git push -f \ && git checkout $sourceBranch fi