Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
nielsbasjes committed Jan 27, 2024
1 parent 3f22b0a commit 0a152db
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 17 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/test-lang-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,6 @@ jobs:
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

# - name: 'Setup Java ${{ matrix.java }}'
# uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
# with:
# distribution: 'temurin'
# java-version: ${{ matrix.java }}

- name: 'Setup Temurin JDK 8, 11, 17 & 21'
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
with:
Expand All @@ -100,7 +94,6 @@ jobs:
11
17
21
${{ matrix.java }}
- name: 'Setup Maven 3.9.6'
uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
Expand Down Expand Up @@ -144,9 +137,13 @@ jobs:
working-directory: lang/csharp
run: ./build.sh interop-data-generate

- name: 'Run Interop Tests'
- name: 'Generate Interop Data using Java 8, 11, 17 & 21'
working-directory: lang/java/interop-data-test
run: mvn -B verify -Pgenerate-test-data

- name: 'Run Interop Tests using Java 8, 11, 17 & 21'
working-directory: lang/java/interop-data-test
run: mvn -B verify -P\!generate-test-data -Pcheck-test-data
run: mvn -B verify -Pcheck-test-data

arm64:
name: Java on Linux ARM64
Expand Down
21 changes: 13 additions & 8 deletions lang/java/interop-data-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

<properties>
<main.basedir>${project.parent.parent.basedir}</main.basedir>
<invoker-action>Do something</invoker-action>
</properties>

<build>
Expand All @@ -61,14 +62,14 @@

<executions>
<execution>
<id>Populate the local repo for integration tests</id>
<id>Populate the local repo for interoperability tests</id>
<goals>
<goal>install</goal>
</goals>
</execution>

<execution>
<id>Run all tests under Java 8</id>
<id>${invoker-action} under Java 8</id>
<goals>
<goal>run</goal>
</goals>
Expand All @@ -85,7 +86,7 @@
</execution>

<execution>
<id>Run all tests under Java 11</id>
<id>${invoker-action} under Java 11</id>
<goals>
<goal>run</goal>
</goals>
Expand All @@ -101,7 +102,7 @@
</execution>

<execution>
<id>Run all tests under Java 17</id>
<id>${invoker-action} under Java 17</id>
<goals>
<goal>run</goal>
</goals>
Expand All @@ -117,7 +118,7 @@
</execution>

<execution>
<id>Run all tests under Java 21</id>
<id>${invoker-action} under Java 21</id>
<goals>
<goal>run</goal>
</goals>
Expand Down Expand Up @@ -180,7 +181,9 @@
<profiles>
<profile>
<id>generate-test-data</id>
<activation><activeByDefault>true</activeByDefault></activation>
<properties>
<invoker-action>Generate interoperability test data</invoker-action>
</properties>
<build>
<plugins>
<plugin>
Expand All @@ -198,6 +201,9 @@

<profile>
<id>check-test-data</id>
<properties>
<invoker-action>Verify interoperability test files</invoker-action>
</properties>
<build>
<plugins>
<plugin>
Expand All @@ -215,10 +221,9 @@

</profiles>


<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down

0 comments on commit 0a152db

Please sign in to comment.