Minor CI cleanup

.github/workflows/main.yml

@@ -10,13 +10,11 @@ on:
             - .pre-commit-config.yaml
             # We use doit only for local builds
             - dodo.py
-            - aarch64-runner/**
     push:
         branches:
             - main
         tags:
             - "v*"
-    workflow_dispatch:
 
 # https://docs.github.com/en/actions/using-jobs/using-concurrency
 concurrency:
@@ -29,46 +27,34 @@ env:
 
 jobs:
 
-    build-amd64:
+    build-x86:
         uses: ./.github/workflows/build.yml
         with:
             runsOn: ubuntu-22.04
             platforms: linux/amd64
 
-    build-arm64:
+    build-arm:
         uses: ./.github/workflows/build.yml
         with:
             runsOn: ubuntu-22.04-arm
             platforms: linux/arm64
 
-    test-amd64:
-        needs: build-amd64
+    test:
+        needs: [build-x86, build-arm]
         strategy:
             fail-fast: false
             matrix:
                 target: ["base", "lab", "base-with-services", "full-stack"]
+                arch: ["x86", "arm"]
         uses: ./.github/workflows/test.yml
         with:
-            runsOn: ubuntu-22.04
-            images: ${{ needs.build-amd64.outputs.images }}
-            target: ${{ matrix.target }}
-            integration: false
-
-    test-arm64:
-        needs: build-arm64
-        strategy:
-            fail-fast: false
-            matrix:
-                target: ["base", "lab", "base-with-services", "full-stack"]
-        uses: ./.github/workflows/test.yml
-        with:
-            runsOn: ubuntu-22.04-arm
-            images: ${{ needs.build-arm64.outputs.images }}
+            runsOn: ubuntu-22.04${{ matrix.arch == 'arm' && '-arm' || ''}}
+            images: ${{ matrix.arch == 'arm' && needs.build-arm.outputs.images || needs.build-x86.outputs.images }}
             target: ${{ matrix.target }}
             integration: false
 
     build:
-        needs: [test-amd64, test-arm64]
+        needs: test
         uses: ./.github/workflows/build.yml
         with:
             runsOn: ubuntu-22.04
@@ -89,7 +75,7 @@ jobs:
             integration: true
 
     publish-ghcr:
-        needs: [build, test-amd64]
+        needs: [build]
         uses: ./.github/workflows/publish.yml
         with:
             runsOn: ubuntu-22.04
@@ -101,7 +87,7 @@ jobs:
         if: >-
             github.repository == 'aiidalab/aiidalab-docker-stack'
             && (github.ref_type == 'tag' || github.ref_name == 'main')
-        needs: [build, test-amd64, test-arm64, publish-ghcr]
+        needs: [build, test, publish-ghcr]
         uses: ./.github/workflows/publish.yml
         with:
             runsOn: ubuntu-22.04

tests/test_aiidalab_apps.py

@@ -21,7 +21,7 @@ def generate_aiidalab_install_output(aiidalab_exec, nb_user):
     def _generate_aiidalab_install_output(package_name):
         nonlocal pkg
         pkg = package_name
-        cmd = f"aiidalab install --yes --pre {package_name}"
+        cmd = f"aiidalab install --yes {package_name}"
 
         output = aiidalab_exec(cmd, user=nb_user).strip()
         output += aiidalab_exec("pip check", user=nb_user).strip()