Skip to content

Commit

Permalink
Merge branch 'main' into add-apicurio-jsonserde-support
Browse files Browse the repository at this point in the history
  • Loading branch information
carlesarnal committed Dec 13, 2023
2 parents 67d4b6f + 07c0c06 commit 54da4ce
Show file tree
Hide file tree
Showing 781 changed files with 13,290 additions and 7,094 deletions.
56 changes: 56 additions & 0 deletions .github/develocity-preapproved-developers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"preapproved-developers": [
"alesj",
"aloubyansky",
"aureamunoz",
"brunobat",
"cescoffier",
"DavideD",
"dmlloyd",
"ebullient",
"emmanuelbernard",
"evanchooly",
"FroMage",
"galderz",
"gastaldi",
"geoand",
"gsmet",
"gwenneg",
"holly-cummins",
"ia3andy",
"iocanel",
"jmartisk",
"johnaohara",
"jponge",
"karesti",
"Karm",
"Ladicek",
"machi1990",
"manovotn",
"manusa",
"maxandersen",
"metacosm",
"MichalMaler",
"michalvavrik",
"michelle-purcell",
"MikeEdgar",
"mkouba",
"n1hility",
"ozangunalp",
"patriot1burke",
"pedroigor",
"phillip-kruger",
"ppalaga",
"radcortez",
"rsvoboda",
"Sanne",
"sberyozkin",
"Sgitario",
"stalep",
"starksm64",
"stuartwdouglas",
"tsegismont",
"yrodiere",
"zakkak"
]
}
7 changes: 0 additions & 7 deletions .github/matrix-jvm-tests.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
[ {
"name": "11",
"java-version": 11,
"maven_args": "$JVM_TEST_MAVEN_ARGS",
"maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g",
"os-name": "ubuntu-latest"
}
, {
"name": "17",
"java-version": 17,
"maven_args": "$JVM_TEST_MAVEN_ARGS",
Expand Down
2 changes: 1 addition & 1 deletion .github/native-tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
{
"category": "Data6",
"timeout": 95,
"test-modules": "elasticsearch-rest-client, elasticsearch-java-client, hibernate-search-orm-elasticsearch, hibernate-search-orm-elasticsearch-tenancy, hibernate-search-orm-opensearch, hibernate-search-orm-elasticsearch-coordination-outbox-polling",
"test-modules": "elasticsearch-rest-client, elasticsearch-java-client, hibernate-search-orm-elasticsearch, hibernate-search-orm-elasticsearch-tenancy, hibernate-search-orm-opensearch, hibernate-search-orm-elasticsearch-outbox-polling",
"os-name": "ubuntu-latest"
},
{
Expand Down
5 changes: 5 additions & 0 deletions .github/quarkus-github-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ triage:
title: "dev.?ui"
notify: [phillip-kruger, cescoffier]
notifyInPullRequest: true
- id: mvnpm
labels: [area/dev-ui]
title: "(mvnpm|mvnpm.org)"
notify: [phillip-kruger]
notifyInPullRequest: true
- labels: [area/gradle]
title: "gradle"
notify: [quarkusio/devtools, glefloch]
Expand Down
41 changes: 41 additions & 0 deletions .github/verify-tests-json.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#!/bin/bash

# Purpose: Verify that a JSON file such as native-tests.json only contains valid references in its "test-modules" fields
# Note: This script is only for CI and does therefore not aim to be compatible with BSD/macOS.

set -e -u -o pipefail
shopt -s failglob

# path of this shell script
PRG_PATH=$( cd "$(dirname "$0")" ; pwd -P )

if (( $# != 2 ))
then
echo 'Invalid parameters'
echo 'Usage: $0 <path from .github/ to json file to check> <path from repository root to integration test directory>'
exit 1
fi

JSON_PATH="${PRG_PATH}/$1"
IT_DIR_PATH="$2"

echo "Checking JSON file $JSON_PATH against modules in directory $IT_DIR_PATH"

INVALID_REFS=($(
# Print unmatched names from the JSON file
# Input 1: List all test modules from the JSON file, one per line, trimmed, sorted
# Input 2: List all Maven modules, one per line, sorted
join -v 1 \
<(jq -r '.include[] | ."test-modules"' ${PRG_PATH}/$1 | tr ',' $'\n' | sed 's|^\s*||;s|\s*$||;' | grep -v '^$' | sort) \
<(find "$IT_DIR_PATH" -mindepth 2 -name pom.xml -exec realpath --relative-to "$IT_DIR_PATH" '{}' \; | xargs -d $'\n' -n 1 dirname | sort)
))

if [[ ${#INVALID_REFS[@]} = 0 ]]
then
echo "$JSON_PATH is valid when checked against $IT_DIR_PATH"
exit 0
else
echo "$JSON_PATH is invalid when checked against $IT_DIR_PATH"
echo "'test-modules' that cannot be resolved as paths to Maven modules relative to $IT_DIR_PATH: ${INVALID_REFS[*]}"
exit 1
fi

0 comments on commit 54da4ce

Please sign in to comment.