Skip to content

Commit

Permalink
Try to make build work on versions not supported by format
Browse files Browse the repository at this point in the history
  • Loading branch information
LivInTheLookingGlass committed Aug 11, 2024
1 parent da5b476 commit e712fc9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
distribution: 'adopt'

- name: Run tests
run: make ja_test
run: make ja_test ${{ matrix.java-version > 17 || 'MVN_FLAGS="-e -nf"' }}

- name: Upload code coverage to Codecov
uses: codecov/codecov-action@v3
Expand Down
9 changes: 5 additions & 4 deletions java/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
MVN?=mvn
MVN_FLAGS?= -e
BLUE=\033[0;34m
NC=\033[0m # No Color

Expand All @@ -15,15 +16,15 @@ clean:

.PHONY: test
test: ../LICENSE
@$(MVN) -e test -Dtest.single
@$(MVN) $(MVN_FLAGS) test -Dtest.single

test_auto: ../LICENSE
@$(MVN) -e test -T 1C
@$(MVN) $(MVN_FLAGS) test -T 1C

.PHONY: test_%
test_%: ../LICENSE
@$(MVN) -e test -T $*
@$(MVN) $(MVN_FLAGS) test -T $*

.PHONY: lint
lint:
@$(MVN) formatter:format
@$(MVN) $(MVN_FLAGS) formatter:format
1 change: 0 additions & 1 deletion java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.24.1</version>
<optional>true</optional>
<configuration>
<javaExclusionPattern>(\W+\.?[^\W]+\(.*\);?\n)+</javaExclusionPattern>
<lineSeparator>\n</lineSeparator>
Expand Down

0 comments on commit e712fc9

Please sign in to comment.