Skip to content

Commit

Permalink
WFTC-117 Upgrade github actions to avoid github action warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
chengfang committed Dec 8, 2022
1 parent b8124f7 commit 487d13a
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ on:

jobs:
build-test-matrix:
name: ${{ matrix.impl}}-${{ matrix.jdk }}-${{ matrix.os }}
name: ${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
runs-on: ${{ matrix.os }}
timeout-minutes: 5
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-latest]
jdk: [11, 17]
impl: [hotspot, openj9]
os: [ubuntu-latest, windows-latest]
jdk-distribution: [temurin, adopt-openj9]
jdk-version: [11, 17]
steps:
- name: Configure runner - Linux
if: contains(matrix.os, 'ubuntu')
Expand All @@ -30,16 +30,16 @@ jobs:
echo '127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4' > %SystemRoot%\System32\drivers\etc\hosts
echo '::1 localhost localhost.localdomain localhost6 localhost6.localdomain6' >> %SystemRoot%\System32\drivers\etc\hosts
shell: cmd
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.jdk }}
uses: AdoptOpenJDK/install-jdk@v1
- uses: actions/checkout@v3
- name: Set up JDK ${{ matrix.jdk-distribution }} ${{ matrix.jdk-version }}
uses: actions/setup-java@v3
with:
version: ${{ matrix.jdk }}
impl: ${{ matrix.impl }}
distribution: ${{ matrix.jdk-distribution }}
java-version: ${{ matrix.jdk-version }}
- name: Run Tests
run: mvn -ntp -U -B -fae clean install
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
if: failure()
with:
name: surefire-reports-${{ matrix.openjdk}}-${{ matrix.jdk }}-${{ matrix.os }}
name: surefire-${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
path: '**/surefire-reports/*.txt'
16 changes: 8 additions & 8 deletions .github/workflows/ejb-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ on:

jobs:
build-test-matrix:
name: ${{ matrix.distro }}-${{ matrix.jdk }}-${{ matrix.os }}
name: ${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
runs-on: ${{ matrix.os }}
timeout-minutes: 15
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
jdk: [17]
distro: [temurin]
jdk-distribution: [adopt]
jdk-version: [17]
steps:
- name: Configure runner - Linux
if: contains(matrix.os, 'ubuntu')
Expand All @@ -32,11 +32,11 @@ jobs:
echo '::1 localhost localhost.localdomain localhost6 localhost6.localdomain6' >> %SystemRoot%\System32\drivers\etc\hosts
shell: cmd
- uses: actions/checkout@v3
- name: Set up JDK ${{ matrix.jdk }}
- name: Set up JDK ${{ matrix.jdk-distribution }} ${{ matrix.jdk-version }}
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.jdk }}
distribution: ${{ matrix.distro }}
distribution: ${{ matrix.jdk-distribution }}
java-version: ${{ matrix.jdk-version }}
cache: 'maven'
- name: Run Tests
run: |
Expand All @@ -52,8 +52,8 @@ jobs:
run: |
cd jboss-ejb-client
mvn -ntp -U -B -Dmaven.source.skip -Dversion.org.wildfly.transaction.client=$WTC_VER -Dmaven.compiler.showWarnings=false -Dmaven.compiler.showDeprecation=false clean install
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
if: failure()
with:
name: surefire-reports-${{ matrix.distro }}-${{ matrix.jdk }}-${{ matrix.os }}
name: surefire-${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
path: '**/surefire-reports/*.txt'
16 changes: 8 additions & 8 deletions .github/workflows/wildfly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ on:

jobs:
build-test-matrix:
name: ${{ matrix.distro }}-${{ matrix.jdk }}-${{ matrix.os }}
name: ${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
runs-on: ${{ matrix.os }}
timeout-minutes: 45
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
jdk: [17]
distro: [temurin]
jdk-distribution: [temurin]
jdk-version: [17]
steps:
- name: Configure runner - Linux
if: contains(matrix.os, 'ubuntu')
Expand All @@ -32,11 +32,11 @@ jobs:
echo '::1 localhost localhost.localdomain localhost6 localhost6.localdomain6' >> %SystemRoot%\System32\drivers\etc\hosts
shell: cmd
- uses: actions/checkout@v3
- name: Set up JDK ${{ matrix.jdk }}
- name: Set up JDK ${{ matrix.jdk-distribution }} ${{ matrix.jdk-version }}
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.jdk }}
distribution: ${{ matrix.distro }}
distribution: ${{ matrix.jdk-distribution }}
java-version: ${{ matrix.jdk-version }}
cache: 'maven'
- name: Run Tests
run: |
Expand All @@ -52,8 +52,8 @@ jobs:
run: |
cd wildfly
mvn -ntp -U -B -Dmaven.source.skip -Dversion.org.wildfly.transaction.client=$WTC_VER -Dmaven.compiler.showWarnings=false -Dmaven.compiler.showDeprecation=false clean install
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
if: failure()
with:
name: surefire-reports-${{ matrix.distro }}-${{ matrix.jdk }}-${{ matrix.os }}
name: surefire-${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
path: '**/surefire-reports/*.txt'

0 comments on commit 487d13a

Please sign in to comment.