ci: refine workflows

Author: nialov

.github/workflows/conda.yaml

@@ -20,13 +20,12 @@ jobs:
         init-shell: bash powershell
         micromamba-version: 1.5.6-0
         post-cleanup: all
-    - run: |-
-        echo "Testing package import"
-        python -c 'import fractopo'
-        echo "Testing module entrypoint"
-        python -m fractopo --help
-        echo "Running unittests with pytest"
-        pytest -v
+    - name: Test package import
+      run: python -c 'import fractopo'
+    - name: Test module entrypoint
+      run: python -m fractopo --help
+    - name: Run unittests with pytest
+      run: pytest -v
     strategy:
       fail-fast: false
       matrix:

.github/workflows/main.yaml

@@ -5,6 +5,8 @@
 # Or commit to trigger the pre-commit hook if enabled.
 jobs:
   docker:
+    needs:
+    - nix-fast-build
     permissions:
       contents: read
       packages: write
@@ -18,11 +20,11 @@ jobs:
         name: nialov
     - name: Load image to docker
       run: nix run .#load-fractopo-image
-    - name: Run fractopo-app container
+    - name: Test run of loaded fractopo-app container
       run: docker run -d --name fractopo-test -p 2718:2718 fractopo-app:vsrjfhp7gd4pgxxzhdrmnr4xglwyln35
     - name: Wait for API to be ready
       run: |-
-        for i in {1..30}; do
+        for i in {1..60}; do
           if curl -s http://localhost:2718/; then
             echo "API is up!"
             exit 0

nix/ci.nix

@@ -133,8 +133,7 @@ in
               ];
             };
             docker = lib.recursiveUpdate publishPackages {
-              # TODO: For debugging
-              # needs = [ "nix-fast-build" ];
+              needs = [ "nix-fast-build" ];
               steps =
                 let
 
@@ -158,6 +157,8 @@ in
                       };
                     };
 
+                  dockerPort = builtins.toString 2718;
+
                 in
                 baseNixSteps
                 ++ [
@@ -167,18 +168,18 @@ in
 
                   }
                   {
-                    name = "Run fractopo-app container";
+                    name = "Test run of loaded fractopo-app container";
                     run =
                       let
                         inherit (inputs.self.legacyPackages.x86_64-linux.fractopo-app-image-stream) imageName imageTag;
                       in
-                      "docker run -d --name fractopo-test -p 2718:2718 ${imageName}:${imageTag}";
+                      "docker run -d --name fractopo-test -p ${dockerPort}:${dockerPort} ${imageName}:${imageTag}";
                   }
                   {
                     name = "Wait for API to be ready";
                     run = ''
-                      for i in {1..30}; do
-                        if curl -s http://localhost:2718/; then
+                      for i in {1..60}; do
+                        if curl -s http://localhost:${dockerPort}/; then
                           echo "API is up!"
                           exit 0
                         fi
@@ -190,7 +191,7 @@ in
                   }
                   {
                     name = "Test API root endpoint";
-                    run = "curl -f http://localhost:2718/";
+                    run = "curl -f http://localhost:${dockerPort}/";
                   }
                   (mkPushStep {
                     rev = "$(git rev-parse --short HEAD)";
@@ -227,6 +228,7 @@ in
               strategy = {
                 fail-fast = false;
                 matrix = {
+                  # Test same Python versions as for poetry job
                   inherit (config.workflows.".github/workflows/main.yaml".jobs.poetry.strategy.matrix)
                     python-version
                     ;
@@ -255,12 +257,20 @@ in
                   };
                 }
                 {
+                  name = "Test package import";
                   run = ''
-                    echo "Testing package import"
                     python -c 'import fractopo'
-                    echo "Testing module entrypoint"
+                  '';
+                }
+                {
+                  name = "Test module entrypoint";
+                  run = ''
                     python -m fractopo --help
-                    echo "Running unittests with pytest"
+                  '';
+                }
+                {
+                  name = "Run unittests with pytest";
+                  run = ''
                     pytest -v
                   '';
                 }