Merge pull request #111 from manthonyaiello/feature/build-cleanup

Minor infrastructure cleanup
afrl-rq · Mar 26, 2024 · b3821d2 · b3821d2
2 parents a678379 + dc3dee2
commit b3821d2
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 22 deletions.
diff --git a/.github/workflows/amase.yaml b/.github/workflows/amase.yaml
@@ -4,12 +4,14 @@ on:
             - 'infrastructure/uxas/**'
             - 'infrastructure/paths.sh'
             - 'infrastructure/specs/amase.anod'
+            - 'infrastructure/install-libexec/**'
             - 'anod'
     push:
         paths:
             - 'infrastructure/uxas/**'
             - 'infrastructure/paths.sh'
             - 'infrastructure/specs/amase.anod'
+            - 'infrastructure/install-libexec/**'
             - 'anod'
     schedule:
         - cron: '45 3 * * 4'
@@ -29,19 +31,20 @@ jobs:
                 qualifier: [scenario=release]
         runs-on: ${{ matrix.env.os }}
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
               with:
                   path: OpenUxAS
 
             - name: Set up python ${{ matrix.env.python }}
-              uses: actions/setup-python@v2
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.env.python }}
 
             - name: Set up java
-              uses: actions/setup-java@v1
+              uses: actions/setup-java@v4
               with:
                   java-version: '11'
+                  distribution: 'adopt'
 
             - name: Install infrastructure
               run: |

diff --git a/.github/workflows/infrastructure-install.yaml b/.github/workflows/infrastructure-install.yaml
@@ -21,12 +21,12 @@ jobs:
                 ]
         runs-on: ${{ matrix.env.os }}
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
               with:
                   path: OpenUxAS
 
             - name: Set up python ${{ matrix.env.python }}
-              uses: actions/setup-python@v2
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.env.python }}
 

diff --git a/.github/workflows/run-example.yaml b/.github/workflows/run-example.yaml
@@ -5,6 +5,7 @@ on:
             - 'infrastructure/paths.sh'
             - 'infrastructure/specs/**'
             - 'infrastructure/run_example.py'
+            - 'infrastructure/install-libexec/**'
             - 'anod'
             - 'src/cpp/**'
             - 'run-example'
@@ -14,6 +15,7 @@ on:
             - 'infrastructure/paths.sh'
             - 'infrastructure/specs/**'
             - 'infrastructure/run_example.py'
+            - 'infrastructure/install-libexec/**'
             - 'anod'
             - 'src/cpp/**'
             - 'run-example'
@@ -33,19 +35,20 @@ jobs:
                 ]
         runs-on: ${{ matrix.env.os }}
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
               with:
                   path: OpenUxAS
 
             - name: Set up python ${{ matrix.env.python }}
-              uses: actions/setup-python@v2
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.env.python }}
 
             - name: Set up java
-              uses: actions/setup-java@v1
+              uses: actions/setup-java@v4
               with:
                   java-version: '11'
+                  distribution: 'adopt'
 
             - name: Install infrastructure
               run: |

diff --git a/.github/workflows/run-lmcpgen.yaml b/.github/workflows/run-lmcpgen.yaml
@@ -4,13 +4,15 @@ on:
             - 'infrastructure/uxas/**'
             - 'infrastructure/paths.sh'
             - 'infrastructure/specs/**'
+            - 'infrastructure/install-libexec/**'
             - 'resources/run-lmcpgen'
             - 'resources/run_lmcpgen.py'
     pull_request:
         paths:
             - 'infrastructure/uxas/**'
             - 'infrastructure/paths.sh'
             - 'infrastructure/specs/**'
+            - 'infrastructure/install-libexec/**'
             - 'resources/run-lmcpgen'
             - 'resources/run_lmcpgen.py'
     workflow_dispatch:
@@ -29,19 +31,20 @@ jobs:
                 ]
         runs-on: ${{ matrix.env.os }}
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
               with:
                   path: OpenUxAS
 
             - name: Set up python ${{ matrix.env.python }}
-              uses: actions/setup-python@v2
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.env.python }}
 
             - name: Set up java
-              uses: actions/setup-java@v1
+              uses: actions/setup-java@v4
               with:
                   java-version: '11'
+                  distribution: 'adopt'
 
             - name: Install infrastructure
               run: |

diff --git a/.github/workflows/uxas-ada.yaml b/.github/workflows/uxas-ada.yaml
@@ -4,13 +4,16 @@ on:
             - 'infrastructure/uxas/**'
             - 'infrastructure/paths.sh'
             - 'infrastructure/specs/**'
+            - 'infrastructure/install-libexec/**'
             - 'anod'
             - 'src/ada/**'
             - 'tests/proof/**'
     pull_request:
         paths:
             - 'infrastructure/uxas/**'
             - 'infrastructure/paths.sh'
+            - 'infrastructure/specs/**'
+            - 'infrastructure/install-libexec/**'
             - 'anod'
             - 'src/ada/**'
             - 'tests/proof/**'
@@ -32,19 +35,20 @@ jobs:
                 qualifier: [scenario=release]
         runs-on: ${{ matrix.env.os }}
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
               with:
                   path: OpenUxAS
 
             - name: Set up python ${{ matrix.env.python }}
-              uses: actions/setup-python@v2
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.env.python }}
 
             - name: Set up java
-              uses: actions/setup-java@v1
+              uses: actions/setup-java@v4
               with:
                   java-version: '11'
+                  distribution: 'adopt'
 
             - name: Install infrastructure
               run: |

diff --git a/.github/workflows/uxas-cpp.yaml b/.github/workflows/uxas-cpp.yaml
@@ -4,13 +4,16 @@ on:
             - 'infrastructure/uxas/**'
             - 'infrastructure/paths.sh'
             - 'infrastructure/specs/**'
+            - 'infrastructure/install-libexec/**'
             - 'anod'
             - 'src/cpp/**'
             - 'tests/cpp/**'
     pull_request:
         paths:
             - 'infrastructure/uxas/**'
             - 'infrastructure/paths.sh'
+            - 'infrastructure/specs/**'
+            - 'infrastructure/install-libexec/**'
             - 'anod'
             - 'src/cpp/**'
             - 'tests/cpp/**'
@@ -32,19 +35,20 @@ jobs:
                 qualifier: [scenario=release, scenario=gcov]
         runs-on: ${{ matrix.env.os }}
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
               with:
                   path: OpenUxAS
 
             - name: Set up python ${{ matrix.env.python }}
-              uses: actions/setup-python@v2
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.env.python }}
 
             - name: Set up java
-              uses: actions/setup-java@v1
+              uses: actions/setup-java@v4
               with:
                   java-version: '11'
+                  distribution: 'adopt'
 
             - name: Install infrastructure
               run: |

diff --git a/.github/workflows/uxas-module.yaml b/.github/workflows/uxas-module.yaml
@@ -21,12 +21,12 @@ jobs:
                 ]
         runs-on: ${{ matrix.env.os }}
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
               with:
                   path: OpenUxAS
 
             - name: Set up python ${{ matrix.env.python }}
-              uses: actions/setup-python@v2
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.env.python }}
 

diff --git a/infrastructure/install-libexec/install-gnat.py b/infrastructure/install-libexec/install-gnat.py
@@ -51,7 +51,6 @@
         "install",
         "-y",
         "unzip",
-        "libsodium-dev",  # TBD if we want this here
     ],
     description="Installing dependencies",
 )
@@ -63,7 +62,7 @@
 
 ALR_DOWNLOAD_LINK = (
     "https://github.com/alire-project/alire/releases/download/"
-    "v2.0.0/alr-2.0.0-bin-x86_64-linux.zip"
+    "v2.0.1/alr-2.0.1-bin-x86_64-linux.zip"
 )
 ALR_DOWNLOAD_FILE = "alr.zip"
 ALR_DOWNLOAD_CMD = Command(

diff --git a/infrastructure/specs/config/repositories.yaml b/infrastructure/specs/config/repositories.yaml
@@ -36,7 +36,7 @@ sqlitecpp:
   vcs: git
 zeromqada:
   revision: master
-  url: https://github.com/manthonyaiello/zeromq-Ada.git
+  url: https://github.com/persan/zeromq-Ada.git
   vcs: git
 zyre:
   revision: v2.0.0