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

ci(gh workflows): review workflows in direction of new vars #155

Merged
merged 1 commit into from
Oct 12, 2023
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,19 @@
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
persist-credentials: false
- uses: actions/setup-java@v3
with:
java-version: "18"
distribution: "adopt"
java-version: ${{ vars.RTLDEV_MW_CI_JAVA_VERSION }}
distribution: ${{ vars.RTLDEV_MW_CI_JAVA_DISTRO }}
- name: Setup NodeJS ${{ vars.RTLDEV_MW_CI_NODE_VERSION }}
uses: actions/setup-node@v3
with:
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
jobs:
# separate job to set as required in branch protection,
# as the build names above change each time Node versions change
test:
lint:
name: Linting
runs-on: ubuntu-latest
steps:
Expand All @@ -35,16 +35,14 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

test_matrix:
runs-on: ubuntu-latest

strategy:
matrix:
java-version:
- 16
- 17
- 18
java-version: ${{ fromJson(vars.RTLDEV_MW_CI_JAVA_MATRIX) }}

runs-on: ubuntu-latest
needs: test
name: Test @ Java JDK ${{ matrix.java-version }}
needs: lint

steps:
- name: Checkout
Expand All @@ -56,7 +54,7 @@ jobs:
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java-version }}
distribution: "temurin"
distribution: ${{ vars.RTLDEV_MW_CI_JAVA_DISTRO }}
- name: Validate & Coverage Report
run: |
mvn -B clean site package
Expand Down