Skip to content
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

improve the ci to allow adding new config #11352

Merged
merged 6 commits into from
Nov 15, 2024
Merged

improve the ci to allow adding new config #11352

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
94fe207
feat: ensure the new configurations in generator.sh and github-action…
renanfranca Nov 11, 2024
f2b0c60
fix: continue the steps in jobs: generation even if the step name: '…
renanfranca Nov 12, 2024
a746e9c
fix: remove unnecessary continue-on-error: true from step name: 'Gene…
renanfranca Nov 12, 2024
c9a776c
fix: add a condition to only calculate the md5sum and compare the md5…
renanfranca Nov 12, 2024
4e26ffd
fix: modify step that generate the matrix.app from main to capture ge…
renanfranca Nov 12, 2024
b3517b5
fix: use trap command to ensure that the ./stop script is called on e…
renanfranca Nov 12, 2024
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
57 changes: 38 additions & 19 deletions .github/workflows/github-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,26 +289,38 @@ jobs:
- name: 'Generation: generate ${{ matrix.app }} from main branch'
if: github.event_name == 'pull_request'
working-directory: ./main-branch/tests-ci/
continue-on-error: true
id: generate-main
run: |
# Set up trap to ensure stop.sh is called on exit
trap './stop.sh' EXIT

./start.sh 7471
./generate.sh ${{ matrix.app }} ${{ matrix.java-build-tool }} ${{ matrix.spring-config-format }}
./stop.sh
GENERATE_EXIT_CODE=$?
echo "exit_code=$GENERATE_EXIT_CODE" >> $GITHUB_OUTPUT
exit $GENERATE_EXIT_CODE
- name: 'Generation: calculate md5sum ${{ matrix.app }} from main branch'
if: github.event_name == 'pull_request'
id: calculate-md5sum-main
working-directory: /tmp/jhlite/${{ matrix.app }}/
run: |
app_md5=$(find . \
-not -path './.git/*' \
-not -path './.github/*' \
-not -path './.jhipster/*' \
-not -path './node_modules/*' \
-not -path './target/*' \
-not -path './build/*' \
-type f -exec md5sum {} + | LC_ALL=C sort | md5sum | head -n1 | cut -d " " -f1)
echo main branch hash from project ${{ matrix.app }} $app_md5
echo "hash=$app_md5" >> $GITHUB_OUTPUT
ls -al /tmp/jhlite/${{ matrix.app }}
if [ -d "/tmp/jhlite/${{ matrix.app }}" ] && [ "${{ steps.generate-main.outputs.exit_code }}" == "0" ]; then
cd /tmp/jhlite/${{ matrix.app }}/
app_md5=$(find . \
-not -path './.git/*' \
-not -path './.github/*' \
-not -path './.jhipster/*' \
-not -path './node_modules/*' \
-not -path './target/*' \
-not -path './build/*' \
-type f -exec md5sum {} + | LC_ALL=C sort | md5sum | head -n1 | cut -d " " -f1)
echo "hash=$app_md5" >> $GITHUB_OUTPUT
echo "exists=true" >> $GITHUB_OUTPUT
echo "main branch hash from project ${{ matrix.app }} $app_md5"
else
echo "App does not exist in main branch or generation failed"
echo "exists=false" >> $GITHUB_OUTPUT
fi
- name: 'Clean: delete ${{ matrix.app }} from main branch'
if: github.event_name == 'pull_request'
run: |
Expand All @@ -335,6 +347,7 @@ jobs:
./generate.sh ${{ matrix.app }} ${{ matrix.java-build-tool }} ${{ matrix.spring-config-format }}
./stop.sh
- name: 'Generation: calculate md5sum ${{ matrix.app }}'
if: github.event_name == 'pull_request' && steps.calculate-md5sum-main.outputs.exists == 'true'
id: calculate-md5sum
working-directory: /tmp/jhlite/${{ matrix.app }}/
run: |
Expand All @@ -350,13 +363,11 @@ jobs:
echo "hash=$app_md5" >> $GITHUB_OUTPUT
ls -al /tmp/jhlite/${{ matrix.app }}
- name: 'Compare hash main x pull request ${{ matrix.app }}'
if: github.event_name == 'pull_request'
if: github.event_name == 'pull_request' && steps.calculate-md5sum-main.outputs.exists == 'true'
id: compare-hash
working-directory: /tmp/jhlite/${{ matrix.app }}/
run: |
echo main branch hash from project ${{ matrix.app }} ${{ steps.calculate-md5sum-main.outputs.hash }}
echo pull request branch hash from project ${{ matrix.app }} ${{ steps.calculate-md5sum.outputs.hash }}
# Compare hashes
echo "main branch hash from project ${{ matrix.app }} ${{ steps.calculate-md5sum-main.outputs.hash }}"
echo "pull request branch hash from project ${{ matrix.app }} ${{ steps.calculate-md5sum.outputs.hash }}"
if [ "${{ steps.calculate-md5sum-main.outputs.hash }}" != "${{ steps.calculate-md5sum.outputs.hash }}" ]; then
echo "different=true" >> $GITHUB_OUTPUT
else
Expand All @@ -365,9 +376,17 @@ jobs:
- name: 'Determine if tests are needed'
id: tests-requirement-check
run: |
if [[ "${{ steps.compare-hash.outputs.different }}" == "true" || "${{ steps.compare-hash.conclusion }}" == "skipped" ]]; then
if [[ "${{ github.event_name }}" != "pull_request" ]]; then
echo "Not a PR - will run tests"
echo "execute_tests=true" >> $GITHUB_OUTPUT
elif [[ "${{ steps.calculate-md5sum-main.outputs.exists }}" != "true" ]]; then
echo "App doesn't exist in main branch - will run tests"
echo "execute_tests=true" >> $GITHUB_OUTPUT
elif [[ "${{ steps.compare-hash.outputs.different }}" == "true" ]]; then
echo "Hashes are different - will run tests"
echo "execute_tests=true" >> $GITHUB_OUTPUT
else
echo "Hashes are identical - will skip tests"
echo "execute_tests=false" >> $GITHUB_OUTPUT
fi
- name: 'Test: list ${{ matrix.app }}'
Expand Down