Make execution of tests in Nix builds optional (#873)

ton-blockchain · Jan 24, 2024 · 9f1b370 · 9f1b370
1 parent 2e231ec
commit 9f1b370
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 19 deletions.
diff --git a/.github/workflows/ton-x86-64-linux.yml b/.github/workflows/ton-x86-64-linux.yml
@@ -24,7 +24,7 @@ jobs:
       run: |
         cp assembly/nix/build-linux-x86-64-nix.sh .
         chmod +x build-linux-x86-64-nix.sh
-        ./build-linux-x86-64-nix.sh
+        ./build-linux-x86-64-nix.sh -t
 
     - name: Simple binaries test
       run: |
@@ -38,4 +38,4 @@ jobs:
       uses: actions/upload-artifact@master
       with:
         name: ton-x86_64-linux-binaries
-        path: artifacts
+        path: artifacts
diff --git a/.github/workflows/ton-x86-64-macos.yml b/.github/workflows/ton-x86-64-macos.yml
@@ -20,7 +20,7 @@ jobs:
       run: |
         cp assembly/nix/build-macos-nix.sh .
         chmod +x build-macos-nix.sh
-        ./build-macos-nix.sh
+        ./build-macos-nix.sh -t
 
     - name: Simple binaries test
       run: |
@@ -34,4 +34,4 @@ jobs:
       uses: actions/upload-artifact@master
       with:
         name: ton-x86_64-macos-binaries
-        path: artifacts
+        path: artifacts
diff --git a/assembly/cicd/jenkins/test-builds.groovy b/assembly/cicd/jenkins/test-builds.groovy
@@ -31,7 +31,7 @@ pipeline {
                             sh '''
                                 cp assembly/nix/build-linux-x86-64-nix.sh .
                                 chmod +x build-linux-x86-64-nix.sh
-                                ./build-linux-x86-64-nix.sh
+                                ./build-linux-x86-64-nix.sh -t
                             '''
                             sh '''
                                 cd artifacts
@@ -69,7 +69,7 @@ pipeline {
                             sh '''
                                 cp assembly/nix/build-linux-arm64-nix.sh .
                                 chmod +x build-linux-arm64-nix.sh
-                                ./build-linux-arm64-nix.sh
+                                ./build-linux-arm64-nix.sh -t
                             '''
                             sh '''
                                 cd artifacts
@@ -107,7 +107,7 @@ pipeline {
                             sh '''
                                 cp assembly/nix/build-macos-nix.sh .
                                 chmod +x build-macos-nix.sh
-                                ./build-macos-nix.sh
+                                ./build-macos-nix.sh -t
                             '''
                             sh '''
                                 cd artifacts
@@ -145,7 +145,7 @@ pipeline {
                             sh '''
                                 cp assembly/nix/build-macos-nix.sh .
                                 chmod +x build-macos-nix.sh
-                                ./build-macos-nix.sh
+                                ./build-macos-nix.sh -t
                             '''
                             sh '''
                                 cd artifacts
@@ -233,4 +233,4 @@ pipeline {
             }
         }
     }
-}
+}
diff --git a/assembly/nix/build-linux-arm64-nix.sh b/assembly/nix/build-linux-arm64-nix.sh
@@ -3,12 +3,27 @@
 nix-build --version
 test $? -eq 0 || { echo "Nix is not installed!"; exit 1; }
 
+with_tests=false
+
+
+while getopts 't' flag; do
+  case "${flag}" in
+    t) with_tests=true ;;
+    *) break
+       ;;
+  esac
+done
+
 cp assembly/nix/linux-arm64* .
 cp assembly/nix/microhttpd.nix .
 cp assembly/nix/openssl.nix .
 export NIX_PATH=nixpkgs=https://github.com/nixOS/nixpkgs/archive/23.05.tar.gz
 
-nix-build linux-arm64-static.nix
+if [ "$with_tests" = true ]; then
+  nix-build linux-arm64-static.nix --arg testing true
+else
+  nix-build linux-arm64-static.nix
+fi
 mkdir artifacts
 cp ./result/bin/* artifacts/
 chmod +x artifacts/*
@@ -17,4 +32,4 @@ nix-build linux-arm64-tonlib.nix
 cp ./result/lib/libtonlibjson.so.0.5 artifacts/libtonlibjson.so
 cp ./result/lib/libemulator.so artifacts/
 cp -r crypto/fift/lib artifacts/
-cp -r crypto/smartcont artifacts/
+cp -r crypto/smartcont artifacts/
diff --git a/assembly/nix/build-linux-x86-64-nix.sh b/assembly/nix/build-linux-x86-64-nix.sh
@@ -3,12 +3,28 @@
 nix-build --version
 test $? -eq 0 || { echo "Nix is not installed!"; exit 1; }
 
+with_tests=false
+
+
+while getopts 't' flag; do
+  case "${flag}" in
+    t) with_tests=true ;;
+    *) break
+       ;;
+  esac
+done
+
 cp assembly/nix/linux-x86-64* .
 cp assembly/nix/microhttpd.nix .
 cp assembly/nix/openssl.nix .
 export NIX_PATH=nixpkgs=https://github.com/nixOS/nixpkgs/archive/23.05.tar.gz
 
-nix-build linux-x86-64-static.nix
+if [ "$with_tests" = true ]; then
+  nix-build linux-x86-64-static.nix --arg testing true
+else
+  nix-build linux-x86-64-static.nix
+fi
+
 mkdir artifacts
 cp ./result/bin/* artifacts/
 chmod +x artifacts/*
@@ -17,4 +33,4 @@ nix-build linux-x86-64-tonlib.nix
 cp ./result/lib/libtonlibjson.so.0.5 artifacts/libtonlibjson.so
 cp ./result/lib/libemulator.so artifacts/
 cp -r crypto/fift/lib artifacts/
-cp -r crypto/smartcont artifacts/
+cp -r crypto/smartcont artifacts/
diff --git a/assembly/nix/build-macos-nix.sh b/assembly/nix/build-macos-nix.sh
@@ -3,9 +3,25 @@
 nix-build --version
 test $? -eq 0 || { echo "Nix is not installed!"; exit 1; }
 
+with_tests=false
+
+
+while getopts 't' flag; do
+  case "${flag}" in
+    t) with_tests=true ;;
+    *) break
+       ;;
+  esac
+done
+
 cp assembly/nix/macos-* .
 export NIX_PATH=nixpkgs=https://github.com/nixOS/nixpkgs/archive/23.05.tar.gz
-nix-build macos-static.nix
+
+if [ "$with_tests" = true ]; then
+  nix-build macos-static.nix --arg testing true
+else
+  nix-build macos-static.nix
+fi
 mkdir artifacts
 cp ./result-bin/bin/* artifacts/
 chmod +x artifacts/*
@@ -14,4 +30,4 @@ nix-build macos-tonlib.nix
 cp ./result/lib/libtonlibjson.dylib artifacts/
 cp ./result/lib/libemulator.dylib artifacts/
 cp -r crypto/fift/lib artifacts/
-cp -r crypto/smartcont artifacts/
+cp -r crypto/smartcont artifacts/
diff --git a/assembly/nix/linux-arm64-static.nix b/assembly/nix/linux-arm64-static.nix
@@ -3,6 +3,7 @@
 { pkgs ? import <nixpkgs> { system = builtins.currentSystem; }
 , lib ? pkgs.lib
 , stdenv ? pkgs.stdenv
+, testing ? false
 }:
 let
   microhttpdmy = (import ./microhttpd.nix) {};
@@ -25,7 +26,7 @@ stdenv.mkDerivation {
     ];
 
   makeStatic = true;
-  doCheck = true;
+  doCheck = testing;
 
   cmakeFlags = [
     "-DTON_USE_ABSEIL=OFF"

diff --git a/assembly/nix/linux-x86-64-static.nix b/assembly/nix/linux-x86-64-static.nix
@@ -3,6 +3,7 @@
 { pkgs ? import <nixpkgs> { system = builtins.currentSystem; }
 , lib ? pkgs.lib
 , stdenv ? pkgs.stdenv
+, testing ? false
 }:
 let
   microhttpdmy = (import ./microhttpd.nix) {};
@@ -25,7 +26,7 @@ stdenv.mkDerivation {
     ];
 
   makeStatic = true;
-  doCheck = true;
+  doCheck = testing;
 
   cmakeFlags = [
     "-DTON_USE_ABSEIL=OFF"

diff --git a/assembly/nix/macos-static.nix b/assembly/nix/macos-static.nix
@@ -3,6 +3,7 @@
 { pkgs ? import <nixpkgs> { system = builtins.currentSystem; }
 , lib ? pkgs.lib
 , stdenv ? pkgs.stdenv
+, testing ? false
 }:
 
 pkgs.llvmPackages_14.stdenv.mkDerivation {
@@ -29,7 +30,7 @@ pkgs.llvmPackages_14.stdenv.mkDerivation {
 
   dontAddStaticConfigureFlags = true;
   makeStatic = true;
-  doCheck = true;
+  doCheck = testing;
 
   configureFlags = [];
 
@@ -62,4 +63,4 @@ pkgs.llvmPackages_14.stdenv.mkDerivation {
       done
   '';
   outputs = [ "bin" "out" ];
-}
+}