Skip to content

Commit

Permalink
Update gitflow-incremental-builder to 4.5.0 and tweak gib-impacted.log
Browse files Browse the repository at this point in the history
  • Loading branch information
famod committed Aug 7, 2023
1 parent ec40da4 commit 8041859
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 8 deletions.
8 changes: 6 additions & 2 deletions .github/filter-native-tests-json.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@ PRG_PATH=$( cd "$(dirname "$0")" ; pwd -P )

JSON=$(cat ${PRG_PATH}/native-tests.json)

# Step 0: print unfiltered json and exit in case the parameter is empty (assumption: full build)
if [ -z "$1" ]
# Step 0: print unfiltered json and exit in case the parameter is '_all_' (full build) or print nothing if empty (no changes)
if [ "$1" == '_all_' ]
then
echo "${JSON}"
exit 0
elif [ -z "$1" ]
then
echo ''
exit 0
fi

# Step 1: build an expression for grep that will only extract the given modules from each "test-modules" list,
Expand Down
8 changes: 6 additions & 2 deletions .github/filter-virtual-threads-tests-json.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@ PRG_PATH=$( cd "$(dirname "$0")" ; pwd -P )

JSON=$(cat ${PRG_PATH}/virtual-threads-tests.json)

# Step 0: print unfiltered json and exit in case the parameter is empty (assumption: full build)
if [ -z "$1" ]
# Step 0: print unfiltered json and exit in case the parameter is '_all_' (full build) or print nothing if empty (no changes)
if [ "$1" == '_all_' ]
then
echo "${JSON}"
exit 0
elif [ -z "$1" ]
then
echo ''
exit 0
fi

# Step 1: build an expression for grep that will only extract the given modules from each "test-modules" list,
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/ci-actions-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,11 @@ jobs:
# mvnw just for creating gib-impacted.log ("validate" should not waste much time if not incremental at all, e.g. on main)
run: |
./mvnw -q -T1C $COMMON_MAVEN_ARGS -Dtcks -Dquickly-ci ${{ steps.get-gib-args.outputs.gib_args }} -Dgib.logImpactedTo=gib-impacted.log validate
if [ -s gib-impacted.log ]
if [ -f gib-impacted.log ]
then
GIB_IMPACTED=$(cat gib-impacted.log)
else
GIB_IMPACTED=''
GIB_IMPACTED='_all_'
fi
echo "GIB_IMPACTED: ${GIB_IMPACTED}"
# three steps to retain linefeeds in output for other jobs
Expand Down Expand Up @@ -238,7 +238,10 @@ jobs:
id: calc-run-flags
run: |
run_jvm=true; run_devtools=true; run_gradle=true; run_maven=true; run_quickstarts=true; run_tcks=true
if [ -n "${GIB_IMPACTED_MODULES}" ]
if [ -z "${GIB_IMPACTED_MODULES}" ]
then
run_jvm=false; run_devtools=false; run_gradle=false; run_maven=false; run_quickstarts=false; run_tcks=false
elif [ "${GIB_IMPACTED_MODULES}" != '_all_' ]
then
# Important: keep -pl ... in actual jobs in sync with the following grep commands!
if ! echo -n "${GIB_IMPACTED_MODULES}" | grep -qPv 'integration-tests/(devtools|gradle|maven)|tcks/.*'; then run_jvm=false; fi
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<postgres.url>jdbc:postgresql:hibernate_orm_test</postgres.url>

<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<gitflow-incremental-builder.version>4.4.1</gitflow-incremental-builder.version>
<gitflow-incremental-builder.version>4.5.0</gitflow-incremental-builder.version>
<quarkus-platform-bom-plugin.version>0.0.92</quarkus-platform-bom-plugin.version>

<skipDocs>false</skipDocs>
Expand Down

0 comments on commit 8041859

Please sign in to comment.