From 247047f0f087ee88ab099b96f46a5f0bf338cd36 Mon Sep 17 00:00:00 2001
From: Susan Witts <54667166+susanw1@users.noreply.github.com>
Date: Wed, 11 Oct 2023 15:55:38 +0100
Subject: [PATCH] [#132] release an alpha version of maven nar and update
 zscript dependencies 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
---
 .github/workflows/maven.yaml | 5 ++++-
 pom.xml                      | 7 -------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index 898c241b1..39e6a6d30 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -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
diff --git a/pom.xml b/pom.xml
index 0bb26ed37..0ea3ed6c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>