Build and test both Jammy and Noble

Noble OMP instead of Jammy OMP

Author: stephankramer

.github/workflows/ubuntu.yml

@@ -17,12 +17,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [ "Build Noble" ]
+        name: [ "Build Noble", "Build Noble OMP", "Build Jammy" ]
         include:
 
           - name: "Build Noble"
             release: noble
 
+          - name: "Build Noble OMP"
+            release: noble-omp
+
+          - name: "Build Jammy"
+            release: jammy
+
     steps:
 
       - name: Check Out Repo
@@ -53,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [ "Unit Noble", "Short Noble", "Medium Noble" ]
+        name: [ "Unit Noble", "Short Noble", "Medium Noble", "Short Jammy" ]
         include:
 
           - name: "Unit Noble"
@@ -71,10 +77,10 @@ jobs:
             command: "make THREADS=2 mediumtest"
             output: "test_results_medium.xml"
 
-          - name: "Unit Noble"
-            release: noble
-            command: "make unittest"
-            output: "test_results_unittests.xml"
+          - name: "Short Jammy"
+            release: jammy
+            command: "make THREADS=2 test"
+            output: "test_results.xml"
 
     steps:
 

docker/actions/Dockerfile.actions.jammy-omp

@@ -0,0 +1,37 @@
+FROM fluidity/baseimages:noble
+
+USER root
+
+RUN apt-get -y update && \
+      apt-get -y dist-upgrade && \
+      rm -rf /var/cache/apt/archives && \
+      rm -rf /var/lib/apt/lists
+
+RUN adduser fluidity sudo
+RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+COPY . /home/fluidity
+RUN chown -R fluidity /home/fluidity
+
+USER fluidity
+WORKDIR /home/fluidity
+
+RUN ./configure --enable-2d-adaptivity --enable-omp
+# NOTE: running "make makefiles" is only needed for
+# developers that have changed any of the module use statements
+# For all other users, this step is NOT needed.
+# "make makefiles" regenerates the */Makefile.dependencies
+# which should already be committed to the repo. We do this here
+# only to check whether the regenerated files have changed from
+# the committed version, in which case the "test -z" and thus the
+# build fails. If that happens, developers should run "make makefiles"
+# locally and commit the changes.
+RUN make makefiles
+RUN test -z "$(git status --porcelain */Makefile.dependencies)"
+
+RUN make
+RUN make fltools
+RUN make manual
+
+# Python module 'assess' is required for some longtests
+RUN python3 -m pip install --break-system-packages assess

docker/actions/Dockerfile.actions.noble-omp

@@ -1185,6 +1185,7 @@ subroutine initialise_constant_diagnostics(unit, binary_format)
     call get_environment_variable(name="HOSTNAME", value=value_buffer, status=stat)
     if (stat /= 0) then
       ewrite(0, *) "GET_ENVIRONMENT_VARIABLE('HOSTNAME') returned no-zero status: ", stat
+    else
       buffer=constant_tag(name="HostName", type="string", value=trim(value_buffer))
       write(unit, '(a)') trim(buffer)
     end if

femtools/Diagnostic_variables.F90

@@ -57,7 +57,6 @@ subroutine fladapt(input_basename_, input_basename_len, &
   interface
     subroutine check_options()
     end subroutine check_options
-
   end interface
 
   character(kind=c_char, len=1) :: input_basename_(*)