Skip to content

Commit

Permalink
Merge branch 'main' into tls-registry
Browse files Browse the repository at this point in the history
  • Loading branch information
cescoffier authored Jun 3, 2024
2 parents 501c6a8 + 58da69f commit e7c0ef7
Show file tree
Hide file tree
Showing 777 changed files with 17,991 additions and 6,320 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ updates:
- dependency-name: org.hibernate.validator:*
- dependency-name: org.hibernate.search:*
# Test dependencies
- dependency-name: net.sourceforge.htmlunit:htmlunit
- dependency-name: org.htmlunit:htmlunit
- dependency-name: io.rest-assured:*
- dependency-name: org.hamcrest:hamcrest
- dependency-name: org.junit:junit-bom
Expand Down
15 changes: 15 additions & 0 deletions .github/quarkus-github-lottery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,18 @@ participants:
maxIssues: 2
stale:
maxIssues: 5
- username: "gastaldi"
timezone: "America/Sao_Paulo"
triage:
days: ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"]
maxIssues: 2
maintenance:
labels: ["area/flyway", "area/quarkiverse"]
days: ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"]
feedback:
needed:
maxIssues: 4
provided:
maxIssues: 2
stale:
maxIssues: 5
72 changes: 72 additions & 0 deletions .github/workflows/ci-actions-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1137,6 +1137,78 @@ jobs:
path: |
build-reports.zip
retention-days: 7
- name: Collect build JSON stats
shell: bash
run: find . -name '*runner*.json' | tar czvf build-stats.tgz -T -
- name: Upload build JSON stats
uses: actions/upload-artifact@v4
with:
name: build-stats-${{matrix.category}}
path: 'build-stats.tgz'
retention-days: 7

native-tests-stats-upload:
name: Upload build stats to collector
if: ${{ always() && github.repository == 'quarkusio/quarkus' && endsWith(github.ref, '/main') && github.event_name != 'pull_request' && needs.native-tests.result != 'skipped' && needs.native-tests.result != 'cancelled' }}
needs:
- native-tests
- calculate-test-jobs
strategy:
fail-fast: false
matrix: ${{ fromJson(needs.calculate-test-jobs.outputs.native_matrix) }}
runs-on: ${{matrix.os-name}}
steps:
- uses: actions/checkout@v4
with:
repository: graalvm/mandrel
fetch-depth: 1
path: workflow-quarkus
- uses: actions/download-artifact@v4
with:
name: build-stats-${{matrix.category}}
path: .
- name: Extract and import build stats
env:
UPLOAD_TOKEN: ${{ secrets.UPLOAD_COLLECTOR_TOKEN }}
COLLECTOR_URL: https://collector.foci.life/api/v1/image-stats
TAG: quarkus-main-ci
shell: bash
run: |
cat > ./runner-info.json <<EOF
{
"test_version": "$GITHUB_REF_NAME",
"quarkus_version": "$GITHUB_SHA",
"description": "Quarkus CI github runner on $GITHUB_REF_NAME branch/tag",
"triggered_by": "Quarkus CI"
}
EOF
jq . runner-info.json
# Add runner info
curl -s -w '\n' -H "Content-Type: application/json" -H "token: $UPLOAD_TOKEN" \
--post302 --data "@./runner-info.json" "${COLLECTOR_URL}/runner-info" | tee runner_info_id.json
runner_info_id=$( jq .id runner_info_id.json )
if [[ $runner_info_id =~ ^[0-9]+$ ]]; then
echo "runner_info_id to be used for uploads: $runner_info_id"
else
echo "Fatal error. runner_info_id is not a number: $runner_info_id"
exit 1
fi
tar -xf build-stats.tgz
echo "Tag to be used for uploads: '${TAG}'"
IFS=$'\n'
for bs in $(find ./ -name \*build-output-stats.json); do
jq . "$(pwd)/$bs"
# import the stat
curl -s -w '\n' -H "Content-Type: application/json" \
-H "token: $UPLOAD_TOKEN" --post302 --data "@$(pwd)/$bs" "$COLLECTOR_URL/import?t=${TAG}&runnerid=${runner_info_id}" | tee stat_id.json
stat_id=$( jq .id stat_id.json )
if [[ $stat_id =~ ^[0-9]+$ ]]; then
echo "ID of imported data: $stat_id"
else
echo "Fatal error. stat_id is not a number: $stat_id"
exit 1
fi
done
build-report:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-istio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Set up Minikube-Kubernetes
uses: manusa/actions-setup-minikube@v2.10.0
uses: manusa/actions-setup-minikube@v2.11.0
with:
minikube version: v1.16.0
kubernetes version: ${{ matrix.kubernetes }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-kubernetes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Set up Minikube-Kubernetes
uses: manusa/actions-setup-minikube@v2.10.0
uses: manusa/actions-setup-minikube@v2.11.0
with:
minikube version: v1.16.0
kubernetes version: ${{ matrix.kubernetes }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview-teardown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
id: deploy
run: npx surge teardown https://quarkus-pr-main-${{ github.event.number }}-preview.surge.sh --token ${{ secrets.SURGE_TOKEN }} || true
- name: Update PR status comment
uses: actions-cool/maintain-one-comment@v3.1.1
uses: actions-cool/maintain-one-comment@v3.2.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
body: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
id: deploy
run: npx surge ./_site --domain https://quarkus-pr-main-${{ steps.pr.outputs.id }}-preview.surge.sh --token ${{ secrets.SURGE_TOKEN }}
- name: Update PR status comment on success
uses: actions-cool/maintain-one-comment@v3.1.1
uses: actions-cool/maintain-one-comment@v3.2.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
body: |
Expand All @@ -111,7 +111,7 @@ jobs:
number: ${{ steps.pr.outputs.id }}
- name: Update PR status comment on failure
if: ${{ failure() }}
uses: actions-cool/maintain-one-comment@v3.1.1
uses: actions-cool/maintain-one-comment@v3.2.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
body: |
Expand Down
6 changes: 3 additions & 3 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
<extension>
<groupId>com.gradle</groupId>
<artifactId>develocity-maven-extension</artifactId>
<version>1.21.2</version>
<version>1.21.4</version>
</extension>
<extension>
<groupId>com.gradle</groupId>
<artifactId>common-custom-user-data-maven-extension</artifactId>
<version>1.13</version>
<version>2</version>
</extension>
<extension>
<groupId>com.gradle</groupId>
<artifactId>quarkus-build-caching-extension</artifactId>
<version>1.0</version>
<version>1.1</version>
</extension>
<extension>
<groupId>io.quarkus.develocity</groupId>
Expand Down
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip
distributionSha256Sum=80b3b63df0e40ca8cde902bb1a40e4488ede24b3f282bd7bd6fba8eb5a7e055c
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
distributionSha256Sum=7822eb593d29558d8edf87845a2c47e36e2a89d17a84cd2390824633214ed423
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
2 changes: 1 addition & 1 deletion .sdkmanrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=17.0.10-tem
mvnd=1.0-m7-m39
mvnd=1.0-m8-m39
12 changes: 6 additions & 6 deletions adr/0001-community-discussions.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ Quarkus community is growing and until now we've catered very well for core cont

We have multiple communication channels: https://github.com/quarkusio/quarkus[issues], https://groups.google.com/g/quarkus-dev?pli=1[quarkus-dev mailing list], https://quarkusio.zulipchat.com[zulip], https://stackoverflow.com/questions/tagged/quarkus[stackoverflow]

Isues are great for bugs/feature work. Mailing list for design conversations between developers, chat for watercooler style discussions and stackoverflow for user questions.
Issues are great for bugs/feature work. Mailing list for design conversations between developers, chat for watercooler style discussions and stackoverflow for user questions.

This setup has issues though, some are:

- zulip chat is used for a lot of users questions but none of that is easily searchable/discoverable so it is very synchronous,
- people reported that they don't feel okey posting on quarkus-dev or zulips as it is seems focused on dev work and not so much about community events, jobs, conferences, etc.
- Zulip chat is used for a lot of users questions but none of that is easily searchable/discoverable so it is very synchronous,
- people reported that they don't feel okey posting on quarkus-dev or Zulip as it seems focused on dev work and not so much about community events, jobs, conferences, etc.
- its hard to monitor as contributor who wants to help answer/ask questions.
- Users reported they do not have access to Zulip chat due to corporate or company policies/proxies. They do have access to GitHub.

How can we improve this situaton and enable the broader community to more easily ask questions and find answers - without it all be relying on just a few Quarkus core contributors?
How can we improve this situation and enable the broader community to more easily ask questions and find answers - without it all be relying on just a few Quarkus core contributors?

== Scenarios (optional)

User wants to locate a answer to a question - zulip chats does not show up in google search; stackoverflow might but might not have an answer.
User wants to locate a answer to a question - Zulip chats does not show up in google search; stackoverflow might but might not have an answer.

Contributor want to arrange or attend an event around Quarkus - where do he post/look for info on that ?

Expand Down Expand Up @@ -54,7 +54,7 @@ Enable GitHub discussions feature on `quarkusio/quarkusio` with the following in

- Announcements (post only by admins)
- Introductions (posts by anyone, optional place introduce yourself)
- Comunity (post by anyone, general discussions)
- Community (post by anyone, general discussions)
- Q&A (post by anyone, Q&A mode enabled)
- Quarkus Insights Episodes (show notes and offline comments)
- Events (Setup and announce of interest or other events)
Expand Down
Loading

0 comments on commit e7c0ef7

Please sign in to comment.