Add ARM AppImage and other discussed adjustments

Signed-off-by: Matthew J. Milner <matterhorn103@proton.me>
OpenChemistry · Jan 17, 2025 · a274fe5 · a274fe5
1 parent dee1ea0
commit a274fe5
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -22,12 +22,19 @@ jobs:
       matrix:
         config:
         - {
-            name: "Ubuntu x86", artifact: "Avogadro2-ubuntu-x86_64.tar.gz",
+            name: "Ubuntu x86", artifact: "",
             os: ubuntu-latest,
             cc: "gcc", cxx: "g++",
             build_type: "Release",
             cmake_flags: "-G Ninja",
           }
+        - {
+            name: "Ubuntu ARM", artifact: "",
+            os: ubuntu-24.04-arm,
+            cc: "gcc", cxx: "g++",
+            build_type: "Release",
+            cmake_flags: "-G Ninja",
+          }
         - {
             name: "AppImage x86", artifact: "Avogadro2-x86_64.AppImage",
             os: ubuntu-22.04,
@@ -36,11 +43,11 @@ jobs:
             cmake_flags: "-G Ninja -DINSTALL_BUNDLE_FILES=ON",
           }
         - {
-            name: "Ubuntu ARM", artifact: "ubuntu-arm64.tar.gz",
+            name: "AppImage ARM", artifact: "Avogadro2-arm64.AppImage",
             os: ubuntu-22.04-arm,
             cc: "gcc", cxx: "g++",
             build_type: "Release",
-            cmake_flags: "-G Ninja",
+            cmake_flags: "-G Ninja -DINSTALL_BUNDLE_FILES=ON",
           }
         - {
             name: "Ubuntu Address Sanitizer", artifact: "",
@@ -121,7 +128,6 @@ jobs:
       run: |
         if [ ! -d "${{ runner.workspace }}/build" ]; then mkdir "${{ runner.workspace }}/build"; fi
         cd "${{ runner.workspace }}/build"
-        # won't have any effect except on Mac
         CC=${{matrix.config.cc}} CXX=${{matrix.config.cxx}} cmake $GITHUB_WORKSPACE/openchemistry ${{env.FEATURES}} -DCMAKE_BUILD_TYPE=${{matrix.config.build_type}} ${{matrix.config.cmake_flags}}
       shell: bash
 
@@ -181,12 +187,3 @@ jobs:
     - name: Setup tmate session
       if: ${{ failure() }}
       uses: mxschmitt/action-tmate@v3
-
-    - name: Cleanup
-      if: ${{ always() }} # To ensure this step runs even when earlier steps fail
-      shell: bash
-      run: |
-        ls -la ./
-        rm -rf ./* || true
-        rm -rf ./.??* || true
-        ls -la ./