Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EJBCLIENT-478 Upgrade github actions to avoid github action warnings #596

Merged
merged 1 commit into from Dec 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
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: 15
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-latest]
jdk: [11, 17]
impl: [hotspot]
os: [ubuntu-latest, windows-latest]
jdk-distribution: [temurin]
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 verify
- 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'
22 changes: 11 additions & 11 deletions .github/workflows/interop-mode.yml
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: 15
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-latest]
jdk: [11, 17]
impl: [openj9]
os: [ubuntu-latest, windows-latest]
jdk-distribution: [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 verify -Pee-namespace-interop
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
if: failure()
with:
name: surefire-ee-interoperable-reports-${{ matrix.openjdk}}-${{ matrix.jdk }}-${{ matrix.os }}
name: surefire-ee-interop-${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
path: '**/surefire-ee-interoperable-reports/*.txt'