Skip to content

Commit

Permalink
Enable the jakarta-staging profile for CI runs.
Browse files Browse the repository at this point in the history
Signed-off-by: James R. Perkins <jperkins@redhat.com>
  • Loading branch information
jamezp committed Apr 2, 2024
1 parent bbaf84e commit 15af0f9
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cloud-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
kubectl port-forward --namespace kube-system service/registry 5000:80 &
- name: Cloud Tests - JDK ${{ matrix.java }}
run: |
mvn clean install -Pcloud-tests -pl resteasy-feature-pack/common,resteasy-feature-pack/galleon-feature-pack,testsuite/cloud-tests -amd -am '-Ddebug.logs'
mvn clean install -Pcloud-tests -pl resteasy-feature-pack/common,resteasy-feature-pack/galleon-feature-pack,testsuite/cloud-tests -amd -am '-Ddebug.logs' '-Pjakarta-staging'
- uses: actions/upload-artifact@v4
if: failure()
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
distribution: 'temurin'
cache: 'maven'
- name: Build on ${{ inputs.os }} with Java ${{ inputs.javaVersion }}
run: mvn clean install
run: mvn clean install '-Pjakarta-staging'
- name: Upload surefire reports
uses: actions/upload-artifact@v4
if: failure()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-wildfly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
distribution: 'temurin'
cache: 'maven'
- name: Build on ${{ inputs.os }} with Java ${{ inputs.javaVersion }}
run: mvn clean install '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}'
run: mvn clean install '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}' '-Pjakarta-staging'
- name: Upload surefire reports
uses: actions/upload-artifact@v4
if: failure()
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
cache: 'maven'
- name: Build with Maven Java ${{ matrix.java }} - ${{ matrix.os }}
run: |
mvn clean install -U -B -fae '-Dgithub.actions'
mvn clean install -U -B -fae '-Dgithub.actions' '-Pjakarta-staging'
- uses: actions/upload-artifact@v4
if: failure()
with:
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
cache: 'maven'
- name: Test with ${{ matrix.profile }} - JDK ${{ matrix.java }}
run: |
mvn clean install -U -B -fae ${{ matrix.profile }} '-Dgithub.actions'
mvn clean install -U -B -fae ${{ matrix.profile }} '-Dgithub.actions' '-Pjakarta-staging'
- uses: actions/upload-artifact@v4
if: failure()
with:
Expand All @@ -119,5 +119,5 @@ jobs:
cache: 'maven'
- name: Build Java Docs with Java 17
run: |
mvn clean install -B -DskipTests
mvn clean site -B -DskipTests
mvn clean install -B -DskipTests '-Pjakarta-staging'
mvn clean site -B -DskipTests '-Pjakarta-staging'
4 changes: 2 additions & 2 deletions .github/workflows/resteasy-tck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@ jobs:
id: resteasy-build
run: |
cd resteasy
mvn clean install -U -B -fae -DskipTests
mvn clean install -U -B -fae -DskipTests -Pjakarta-staging
RESTEASY_VERSION="$(mvn -B help:evaluate -Dexpression=project.version -DforceStdout -q)"
echo "RESTEASY_VERSION=$RESTEASY_VERSION"
echo "RESTEASY_VERSION=$RESTEASY_VERSION" >> "$GITHUB_OUTPUT"
- name: Run the Jakarta REST TCK - JDK ${{ matrix.java }}
run: |
echo "RESTEASY_VERSION=${{ steps.resteasy-build.outputs.RESTEASY_VERSION }}"
cd resteasy-tck-runner
mvn clean install -U -B -fae -Dtck.debug.log=true -Dversion.org.jboss.resteasy="${{ steps.resteasy-build.outputs.RESTEASY_VERSION }}"
mvn clean install -U -B -fae -Dtck.debug.log=true -Dversion.org.jboss.resteasy="${{ steps.resteasy-build.outputs.RESTEASY_VERSION }}" -Djakarta.staging
- uses: actions/upload-artifact@v4
if: failure()
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wildfly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
distribution: 'temurin'
cache: 'maven'
- name: Build with Maven Java ${{ matrix.java }}
run: mvn clean install '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}'
run: mvn clean install '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}' '-Pjakarta-staging'
- name: Upload surefire reports
uses: actions/upload-artifact@v4
if: failure()
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
cache: 'maven'
- name: Test with ${{ matrix.profile }} - JDK ${{ matrix.java }}
run: |
mvn clean install -U -B -fae ${{ matrix.profile }} '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}'
mvn clean install -U -B -fae ${{ matrix.profile }} '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}' '-Pjakarta-staging'
- uses: actions/upload-artifact@v4
if: failure()
with:
Expand Down
13 changes: 13 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,19 @@
<profile>
<id>jakarta-staging</id>
<repositories>
<!-- Check Maven Central first -->
<repository>
<id>central</id>
<name>Maven Central</name>
<layout>default</layout>
<url>https://repo1.maven.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>jakarta-sonatype-nexus-staging</id>
<name>Jakarta Sonatype Nexus Staging</name>
Expand Down

0 comments on commit 15af0f9

Please sign in to comment.