Skip to content

Commit

Permalink
Kotlin v1.7.0 support, gradle API change
Browse files Browse the repository at this point in the history
  • Loading branch information
GavinRay97 committed Jul 30, 2022
2 parents 5a30b1b + f19dd4c commit 568f639
Show file tree
Hide file tree
Showing 641 changed files with 8,355 additions and 3,389 deletions.
1 change: 1 addition & 0 deletions .github/dependabot.yml
Expand Up @@ -172,6 +172,7 @@ updates:
- dependency-name: com.github.javaparser:javaparser-core
- dependency-name: org.jboss.jdeparser:jdeparser
- dependency-name: com.github.javaparser:javaparser-core
- dependency-name: com.h2database:h2
ignore:
# this one cannot be upgraded due to the usage of proxies in new versions
# the proxy implements interfaces in a random order which causes issues
Expand Down
2 changes: 1 addition & 1 deletion .github/docker-prune.sh
Expand Up @@ -4,7 +4,7 @@ set -e

# pruning is only run when inside CI to avoid accidentally removing stuff
# GITHUB_ACTIONS is always set to true inside Github Actions
# https://help.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables
# https://docs.github.com/en/actions/learn-github-actions/environment-variables
if [ "${GITHUB_ACTIONS}" == true ] ; then
docker container prune -f
docker image prune -f
Expand Down
2 changes: 1 addition & 1 deletion .github/native-tests.json
Expand Up @@ -27,7 +27,7 @@
{
"category": "Data4",
"timeout": 55,
"test-modules": "mongodb-client, mongodb-panache, mongodb-rest-data-panache, mongodb-panache-kotlin, redis-client, hibernate-orm-rest-data-panache",
"test-modules": "mongodb-client, mongodb-devservices, mongodb-panache, mongodb-rest-data-panache, mongodb-panache-kotlin, redis-client, hibernate-orm-rest-data-panache",
"os-name": "ubuntu-latest"
},
{
Expand Down
12 changes: 8 additions & 4 deletions .github/quarkus-github-bot.yml
Expand Up @@ -72,6 +72,7 @@ triage:
&& !matches("hibernate.search", titleBody)
&& !matches("hibernate.reactive", titleBody)
notify: [gsmet, Sanne, yrodiere]
notifyInPullRequest: true
directories:
# No trailing slashes: we also match sibling directories starting with these names
- extensions/hibernate-orm
Expand All @@ -84,13 +85,15 @@ triage:
- labels: [area/hibernate-search]
title: "hibernate.search"
notify: [gsmet, yrodiere]
notifyInPullRequest: true
directories:
# No trailing slashes: we also match sibling directories starting with these names
- extensions/hibernate-search
- integration-tests/hibernate-search
- labels: [area/elasticsearch]
title: "elasticsearch"
notify: [gsmet, yrodiere, loicmathieu]
notifyInPullRequest: true
directories:
# No trailing slashes: we also match sibling directories starting with these names
- extensions/elasticsearch
Expand All @@ -104,7 +107,7 @@ triage:
- integration-tests/hibernate-validator
- labels: [area/jaeger]
title: "jaeger"
notify: [radcortez]
notify: [radcortez, brunobat]
directories:
- extensions/jaeger/
- labels: [area/jackson]
Expand All @@ -115,7 +118,7 @@ triage:
- integration-tests/jackson/
- labels: [area/kotlin]
titleBody: "kotlin"
notify: [evanchooly]
notify: [evanchooly, geoand]
directories:
- extensions/kotlin/
- integration-tests/kotlin/
Expand Down Expand Up @@ -144,12 +147,12 @@ triage:
- integration-tests/smallrye-graphql-client/
- labels: [area/tracing, area/smallrye]
title: "(trace|tracing)"
notify: [radcortez, Ladicek]
notify: [radcortez, Ladicek, brunobat]
directories:
- extensions/smallrye-opentracing/
- labels: [area/tracing]
title: "(trace|opentelemetry)"
notify: [radcortez]
notify: [radcortez, brunobat]
notifyInPullRequest: true
directories:
- extensions/opentelemetry/
Expand Down Expand Up @@ -363,6 +366,7 @@ triage:
- .github/dependabot.yml
- bom/
- build-parent/
allowSecondPass: true
- labels: [area/devtools]
directories:
- devtools/
Expand Down
34 changes: 18 additions & 16 deletions .github/workflows/ci-actions-incremental.yml
Expand Up @@ -114,11 +114,6 @@ jobs:
gib_args: ${{ steps.get-gib-args.outputs.gib_args }}
gib_impacted: ${{ steps.get-gib-impacted.outputs.impacted_modules }}
steps:
- name: Skip non-compilable modules for jakarta-rewrite branch
run: |
echo "EXCLUDE_JAKARTA_INCOMPATIBLE_MODULES=-pl "'!'":quarkus-integration-test-infinispan-client -pl "'!'":quarkus-integration-test-kafka-avro" >> $GITHUB_ENV
if: github.ref_name == 'jakarta-rewrite'

- uses: actions/checkout@v2
with:
fetch-depth: 0
Expand Down Expand Up @@ -155,7 +150,7 @@ jobs:
run: ./jakarta/prepare.sh
- name: Build
run: |
./mvnw -T1C $COMMON_MAVEN_ARGS $EXCLUDE_JAKARTA_INCOMPATIBLE_MODULES -DskipTests -DskipITs -Dinvoker.skip -Dno-format -Dtcks clean install
./mvnw -T1C $COMMON_MAVEN_ARGS -DskipTests -DskipITs -Dinvoker.skip -Dno-format -Dtcks clean install
- name: Verify extension dependencies
shell: bash
run: ./update-extension-dependencies.sh $COMMON_MAVEN_ARGS
Expand Down Expand Up @@ -186,17 +181,10 @@ jobs:
id: get-gib-impacted
# 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 $EXCLUDE_JAKARTA_INCOMPATIBLE_MODULES -Dtcks -Dquickly-ci ${{ steps.get-gib-args.outputs.gib_args }} -Dgib.logImpactedTo=gib-impacted.log validate
./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 ]
then
# TODO: for now, we don't run TCKs and for the jakarta-rewrite branch
# we filter them here so that it cascades to all the builds
if [ "${GITHUB_REF_NAME}" == "jakarta-rewrite" ]
then
GIB_IMPACTED=$(sed -E '/^(integration-tests\/infinispan-client|integration-tests\/kafka-avro)/d' gib-impacted.log)
else
GIB_IMPACTED=$(cat gib-impacted.log)
fi
GIB_IMPACTED=$(cat gib-impacted.log)
else
GIB_IMPACTED=''
fi
Expand Down Expand Up @@ -317,7 +305,9 @@ jobs:
run: |
ss -ln
sudo service mysql stop || true
- name: Support longpaths on Windows
if: "startsWith(matrix.java.os-name, 'windows')"
run: git config --global core.longpaths true
- uses: actions/checkout@v2
with:
fetch-depth: 0
Expand Down Expand Up @@ -418,6 +408,9 @@ jobs:
os-name: "windows-latest"
}
steps:
- name: Support longpaths on Windows
if: "startsWith(matrix.java.os-name, 'windows')"
run: git config --global core.longpaths true
- uses: actions/checkout@v2
- name: Download Maven Repo
uses: actions/download-artifact@v1
Expand Down Expand Up @@ -490,6 +483,9 @@ jobs:
os-name: "windows-latest"
}
steps:
- name: Support longpaths on Windows
if: "startsWith(matrix.java.os-name, 'windows')"
run: git config --global core.longpaths true
- uses: actions/checkout@v2
- name: Download Maven Repo
uses: actions/download-artifact@v1
Expand Down Expand Up @@ -553,6 +549,9 @@ jobs:
os-name: "windows-latest"
}
steps:
- name: Support longpaths on Windows
if: "startsWith(matrix.java.os-name, 'windows')"
run: git config --global core.longpaths true
- uses: actions/checkout@v2
- name: Download Maven Repo
uses: actions/download-artifact@v1
Expand Down Expand Up @@ -668,6 +667,9 @@ jobs:
fail-fast: false
matrix: ${{ fromJson(needs.calculate-test-jobs.outputs.native_matrix) }}
steps:
- name: Support longpaths on Windows
if: "startsWith(matrix.os-name, 'windows')"
run: git config --global core.longpaths true
- uses: actions/checkout@v2
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
Expand Down
143 changes: 143 additions & 0 deletions .github/workflows/ci-kubernetes.yml
@@ -0,0 +1,143 @@
name: Quarkus CI - Kubernetes

on:
workflow_dispatch:
schedule:
# 2am every weekday + saturday
- cron: '0 2 * * 1-6'

env:
MAVEN_ARGS: -B -e

jobs:
cache:
name: Build and save artifacts
runs-on: ubuntu-latest
if: "github.repository == 'quarkusio/quarkus' || github.event_name == 'workflow_dispatch'"
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
- name: Install artifacts
run: ./mvnw ${MAVEN_ARGS} -DskipTests -DskipITs -Dinvoker.skip clean install -pl :quarkus-integration-test-kubernetes-invoker -am
- name: Tar Maven repository
shell: bash
run: tar -I 'pigz -9' -cf maven-repo.tgz -C ~ .m2/repository
- name: Persist Maven repository
uses: actions/upload-artifact@v3
with:
name: maven-repo
path: maven-repo.tgz
retention-days: 1

kubernetes:
name: Kubernetes Integration Tests
needs: cache
runs-on: ubuntu-latest
if: "github.repository == 'quarkusio/quarkus' || github.event_name == 'workflow_dispatch'"
strategy:
fail-fast: false
matrix:
kubernetes: [v1.20.1]
steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
- name: Download Maven repository
uses: actions/download-artifact@v3
with:
name: maven-repo
path: .
- name: Extract Maven repository
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Set up Minikube-Kubernetes
uses: manusa/actions-setup-minikube@v2.4.1
with:
minikube version: v1.16.0
kubernetes version: ${{ matrix.kubernetes }}
github token: ${{ secrets.GITHUB_TOKEN }}
start args: '--addons=metrics-server --force'
- name: Quay login
uses: docker/login-action@v2
with:
registry: quay.io
username: ${{ secrets.QUAY_QUARKUSCI_USERNAME }}
password: ${{ secrets.QUAY_QUARKUSCI_PASSWORD }}
- name: Run Kubernetes Invoker Tests
run: |
export QUARKUS_CONTAINER_IMAGE_GROUP=quarkustesting
export QUARKUS_CONTAINER_IMAGE_TAG=${{ github.sha }}
export QUARKUS_CONTAINER_IMAGE_REGISTRY=quay.io
./mvnw ${MAVEN_ARGS} clean install -pl :quarkus-integration-test-kubernetes-invoker -De2e-tests -Dkubernetes-e2e-tests
- name: Report status
if: "always() && github.repository == 'quarkusio/quarkus'"
shell: bash
run: |
curl -Ls https://sh.jbang.dev | bash -s - app setup
~/.jbang/bin/jbang .github/NativeBuildReport.java \
issueNumber=26581 \
runId=${{ github.run_id }} \
status=${{ job.status }} \
token=${{ secrets.GITHUB_API_TOKEN }} \
issueRepo=${{ github.repository }} \
thisRepo=${{ github.repository }}
openshift:
name: OpenShift Integration Tests
needs: cache
runs-on: ubuntu-latest
if: "github.repository == 'quarkusio/quarkus' || github.event_name == 'workflow_dispatch'"
strategy:
fail-fast: false
matrix:
openshift: [v3.11.0]
steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
- name: Download Maven repository
uses: actions/download-artifact@v3
with:
name: maven-repo
path: .
- name: Extract Maven repository
shell: bash
run: tar -xzf maven-repo.tgz -C ~
- name: Set up OpenShift
uses: manusa/actions-setup-openshift@v1.1.3
with:
oc version: ${{ matrix.openshift }}
github token: ${{ secrets.GITHUB_TOKEN }}
- name: Quay login
uses: docker/login-action@v2
with:
registry: quay.io
username: ${{ secrets.QUAY_QUARKUSCI_USERNAME }}
password: ${{ secrets.QUAY_QUARKUSCI_PASSWORD }}
- name: Run OpenShift Invoker Tests
run: |
export QUARKUS_CONTAINER_IMAGE_GROUP=quarkustesting
export QUARKUS_CONTAINER_IMAGE_TAG=${{ github.sha }}
export QUARKUS_CONTAINER_IMAGE_REGISTRY=quay.io
./mvnw ${MAVEN_ARGS} clean install -pl :quarkus-integration-test-kubernetes-invoker -De2e-tests -Dopenshift-e2e-tests
- name: Report status
if: "always() && github.repository == 'quarkusio/quarkus'"
shell: bash
run: |
curl -Ls https://sh.jbang.dev | bash -s - app setup
~/.jbang/bin/jbang .github/NativeBuildReport.java \
issueNumber=26582 \
runId=${{ github.run_id }} \
status=${{ job.status }} \
token=${{ secrets.GITHUB_API_TOKEN }} \
issueRepo=${{ github.repository }} \
thisRepo=${{ github.repository }}
11 changes: 4 additions & 7 deletions .github/workflows/jakarta-rewrite.yml
Expand Up @@ -3,13 +3,15 @@ name: Jakarta Rewrite
on:
workflow_dispatch:
schedule:
# 4am every weekday + saturday
- cron: '0 4 * * 1-6'
# 22pm every weekday + saturday
- cron: '0 22 * * 1-6'
jobs:
rewrite:
runs-on: ubuntu-latest
name: Rewrite to Jakarta
if: github.repository == 'quarkusio/quarkus' || github.event_name == 'workflow_dispatch'
env:
MAVEN_OPTS: -Xmx3g -XX:MaxMetaspaceSize=1g
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -37,10 +39,6 @@ jobs:
git commit -m 'Transform sources to Jakarta'
git push --force origin temp-jakarta-rewrite:jakarta-rewrite
shell: bash
- name: Adjust version before pushing snapshots
run: |
./update-version.sh 999-jakarta-SNAPSHOT
shell: bash
- name: Build and Deploy
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_API_TOKEN }}
Expand All @@ -51,7 +49,6 @@ jobs:
-DskipITs -DskipTests -Dskip.gradle.tests -Dno-format -Dinvoker.skip=true \
-DretryFailedDeploymentCount=10 \
-pl !integration-tests/gradle \
-pl '!:quarkus-integration-test-infinispan-client' -pl '!:quarkus-integration-test-kafka-avro' \
clean deploy
- name: Report status
if: "always() && github.repository == 'quarkusio/quarkus'"
Expand Down

0 comments on commit 568f639

Please sign in to comment.