Skip to content

Commit

Permalink
[#132] release an alpha version of maven nar and update zscript depen…
Browse files Browse the repository at this point in the history
…dencies to it (#133)

* [#132] Updated NAR to use net.zscript.maven-nar:nar-maven-plugin

* [#132] Updated to apt-get gcc-multilib g++-multilib

* [#132] Attempt build-arm
  • Loading branch information
susanw1 authored Oct 11, 2023
1 parent 6bfc32d commit 247047f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/maven.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@ jobs:

- uses: carlosperate/arm-none-eabi-gcc-action@v1
- run: arm-none-eabi-gcc --version

- run: sudo apt-get update
- run: sudo apt-get install gcc-multilib g++-multilib
- run: gcc --version

- name: Build with Maven
run: mvn -B verify --file pom.xml
run: mvn -B verify --file pom.xml -Pbuild-arm

- name: Upload Java code coverage reports to Codecov
uses: codecov/codecov-action@v3
Expand Down
7 changes: 0 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<version.apachecommons>2.13.0</version.apachecommons>

<!-- plugin dependency versions -->
<!-- <version.nar-maven-plugin>3.10.2-SNAPSHOT</version.nar-maven-plugin>-->
<version.nar-maven-plugin>3.10.2-alpha</version.nar-maven-plugin>
<version.jacoco-maven-plugin>0.8.10</version.jacoco-maven-plugin>
<version.exec-maven-plugin>3.0.0</version.exec-maven-plugin>
Expand Down Expand Up @@ -147,12 +146,6 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>${version.maven-failsafe-plugin}</version>
</plugin>
<!-- <plugin>-->
<!-- <groupId>com.github.maven-nar</groupId>-->
<!-- <artifactId>nar-maven-plugin</artifactId>-->
<!-- <version>3.10.2-SNAPSHOT</version>-->
<!-- <extensions>true</extensions>-->
<!-- </plugin>-->
<plugin>
<groupId>net.zscript.maven-nar</groupId>
<artifactId>nar-maven-plugin</artifactId>
Expand Down

0 comments on commit 247047f

Please sign in to comment.