From 7e284c27a89a7d3b8204ca9b3cd1af177f9084d1 Mon Sep 17 00:00:00 2001 From: neodiX Date: Mon, 25 Dec 2023 20:11:37 +0100 Subject: [PATCH] WIP jenkins pipeline: remove native static builds --- assembly/cicd/jenkins/test-builds.groovy | 46 ++++-------------------- assembly/nix/linux-arm64-static.nix | 2 +- assembly/nix/macos-arm64-static.nix | 2 +- assembly/nix/macos-arm64-tonlib.nix | 4 +-- assembly/nix/macos-x86-64-static.nix | 2 +- assembly/nix/macos-x86-64-tonlib.nix | 1 - 6 files changed, 11 insertions(+), 46 deletions(-) diff --git a/assembly/cicd/jenkins/test-builds.groovy b/assembly/cicd/jenkins/test-builds.groovy index 774036aa5..6fe294407 100644 --- a/assembly/cicd/jenkins/test-builds.groovy +++ b/assembly/cicd/jenkins/test-builds.groovy @@ -27,22 +27,6 @@ pipeline { } } stage('Ubuntu 20.04 x86-64 (portable)') { - agent { - label 'Ubuntu_x86-64' - } - steps { - timeout(time: 90, unit: 'MINUTES') { - sh ''' - cp assembly/native/build-ubuntu-20.04-portable.sh . - chmod +x build-ubuntu-20.04-portable.sh - ./build-ubuntu-20.04-portable.sh -t -a - ''' - sh 'zip -r ton-x86_64-linux-portable ./artifacts/*' - archiveArtifacts artifacts: 'ton-x86_64-linux-portable.zip' - } - } - } - stage('Ubuntu 20.04 x86-64 (nix)') { agent { label 'Ubuntu_x86-64' } @@ -61,8 +45,8 @@ pipeline { cp ./result/lib/libtonlibjson.so.0.5 tmp/ cp ./result/lib/libemulator.so tmp/ ''' - sh 'zip -r ton-x86-64-linux-nix ./tmp/*' - archiveArtifacts artifacts: 'ton-x86-64-linux-nix.zip' + sh 'zip -r ton-x86-64-linux-portable ./tmp/*' + archiveArtifacts artifacts: 'ton-x86-64-linux-portable.zip' } } } @@ -83,22 +67,6 @@ pipeline { } } stage('Ubuntu 20.04 aarch64 (portable)') { - agent { - label 'Ubuntu_arm64' - } - steps { - timeout(time: 90, unit: 'MINUTES') { - sh ''' - cp assembly/native/build-ubuntu-20.04-portable.sh . - chmod +x build-ubuntu-20.04-portable.sh - ./build-ubuntu-20.04-portable.sh -t -a - ''' - sh 'zip -r ton-arm64-linux-portable ./artifacts/*' - archiveArtifacts artifacts: 'ton-arm64-linux-portable.zip' - } - } - } - stage('Ubuntu 20.04 aarch64 (nix)') { agent { label 'Ubuntu_arm64' } @@ -118,8 +86,8 @@ pipeline { cp ./result/lib/libtonlibjson.so.0.5 tmp/ cp ./result/lib/libemulator.so tmp/ ''' - sh 'zip -r ton-arm64-linux-nix ./tmp/*' - archiveArtifacts artifacts: 'ton-arm64-linux-nix.zip' + sh 'zip -r ton-arm64-linux-portable ./tmp/*' + archiveArtifacts artifacts: 'ton-arm64-linux-portable.zip' } } } @@ -184,13 +152,13 @@ pipeline { steps { timeout(time: 90, unit: 'MINUTES') { sh ''' - cp assembly/nix/macos-arm64-* . + cp assembly/nix/macos-x86-64-* . export NIX_PATH=nixpkgs=https://github.com/nixOS/nixpkgs/archive/23.05.tar.gz - nix-build macos-arm64-static.nix + nix-build macos-x86-64-static.nix mkdir tmp cp ./result-bin/bin/* tmp/ rm -rf result-bin - nix-build macos-arm64-tonlib.nix + nix-build macos-x86-64-tonlib.nix cp ./result/lib/libtonlibjson.dylib tmp/ cp ./result/lib/libemulator.dylib tmp/ ''' diff --git a/assembly/nix/linux-arm64-static.nix b/assembly/nix/linux-arm64-static.nix index de0321f65..7494639f6 100644 --- a/assembly/nix/linux-arm64-static.nix +++ b/assembly/nix/linux-arm64-static.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ]; makeStatic = true; - doCheck = false; + doCheck = true; cmakeFlags = [ "-DTON_USE_ABSEIL=OFF" diff --git a/assembly/nix/macos-arm64-static.nix b/assembly/nix/macos-arm64-static.nix index 95e88e97f..b02c20c85 100644 --- a/assembly/nix/macos-arm64-static.nix +++ b/assembly/nix/macos-arm64-static.nix @@ -28,8 +28,8 @@ pkgs.stdenv.mkDerivation { # clang default dontAddStaticConfigureFlags = true; - doCheck = false; makeStatic = true; + doCheck = true; configureFlags = []; diff --git a/assembly/nix/macos-arm64-tonlib.nix b/assembly/nix/macos-arm64-tonlib.nix index 2be6480b8..732bafa3d 100644 --- a/assembly/nix/macos-arm64-tonlib.nix +++ b/assembly/nix/macos-arm64-tonlib.nix @@ -25,9 +25,7 @@ pkgs.stdenv.mkDerivation { # clang default (libiconv.override { enableStatic = true; enableShared = false; }) ]; - dontAddStaticConfigureFlags = true; - doCheck = false; configureFlags = []; @@ -54,4 +52,4 @@ pkgs.stdenv.mkDerivation { # clang default install_name_tool -change "$(otool -L "$fn" | grep libc++abi.1 | cut -d' ' -f1 | xargs)" libc++abi.dylib "$fn" done ''; -} +} \ No newline at end of file diff --git a/assembly/nix/macos-x86-64-static.nix b/assembly/nix/macos-x86-64-static.nix index e3fb4eef4..6e34a0c3e 100644 --- a/assembly/nix/macos-x86-64-static.nix +++ b/assembly/nix/macos-x86-64-static.nix @@ -28,8 +28,8 @@ pkgs.llvmPackages_14.stdenv.mkDerivation { dontAddStaticConfigureFlags = true; - doCheck = false; makeStatic = true; + doCheck = true; configureFlags = []; diff --git a/assembly/nix/macos-x86-64-tonlib.nix b/assembly/nix/macos-x86-64-tonlib.nix index e27ee15de..c362de4ec 100644 --- a/assembly/nix/macos-x86-64-tonlib.nix +++ b/assembly/nix/macos-x86-64-tonlib.nix @@ -25,7 +25,6 @@ pkgs.llvmPackages_14.stdenv.mkDerivation { (libiconv.override { enableStatic = true; enableShared = false; }) ]; - dontAddStaticConfigureFlags = true; configureFlags = [];