Merge pull request #2293 from jamescowens/deprecation_remove_gitian

release: Remove gitian
gridcoin-community · Sep 4, 2021 · 18da3bc · 18da3bc
2 parents 82aea6c + b40d43b
commit 18da3bc
Show file tree

Hide file tree

Showing 48 changed files with 59 additions and 1,760 deletions.
diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac.sh
@@ -7,7 +7,7 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_macos_cross
-export DOCKER_NAME_TAG=ubuntu:20.04  # Check that Focal can cross-compile to macos (Focal is used in the gitian build as well)
+export DOCKER_NAME_TAG=ubuntu:20.04  # Check that Focal can cross-compile to macos
 export HOST=x86_64-apple-darwin18
 export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools libtinfo5 python3-dev python3-setuptools xorriso"
 export XCODE_VERSION=12.1

diff --git a/ci/test/00_setup_env_win32.sh b/ci/test/00_setup_env_win32.sh
@@ -7,7 +7,7 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_win32
-export DOCKER_NAME_TAG=ubuntu:18.04  # Check that bionic can cross-compile to win32 (bionic is used in the gitian build as well)
+export DOCKER_NAME_TAG=ubuntu:18.04  # Check that bionic can cross-compile to win32
 export HOST=i686-w64-mingw32
 export PACKAGES="python3 nsis g++-mingw-w64-i686 wine-binfmt wine32"
 export RUN_UNIT_TESTS=true

diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh
@@ -7,7 +7,7 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_win64
-export DOCKER_NAME_TAG=ubuntu:18.04  # Check that bionic can cross-compile to win64 (bionic is used in the gitian build as well)
+export DOCKER_NAME_TAG=ubuntu:18.04  # Check that bionic can cross-compile to win64
 export HOST=x86_64-w64-mingw32
 export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64"
 export GOAL=""

diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
@@ -97,18 +97,14 @@ Perform basic security checks on a series of executables.
 symbol-check.py
 ===============
 
-A script to check that the executables produced by gitian only contain
-certain symbols and are only linked against allowed libraries.
+A script to check that release executables only contain certain symbols and are only linked against
+allowed libraries.
 
 For Linux this means checking for allowed gcc, glibc and libstdc++ version symbols.
 This makes sure they are still compatible with the minimum supported distribution versions.
 
 For macOS and Windows we check that the executables are only linked against libraries we allow.
 
-Example usage after a gitian build:
-
-    find ../gitian-builder/build -type f -executable | xargs python3 contrib/devtools/symbol-check.py
-
 If no errors occur the return value will be 0 and the output will be empty.
 
 If there are any errors the return value will be 1 and output like this will be printed:

diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
@@ -6,8 +6,10 @@
 A script to check that the executables produced by gitian only contain
 certain symbols and are only linked against allowed libraries.
 
-Example usage:
+NOTE: gitian is no longer used and this script is not currently being maintained. It may be used in the future
+with Guix deterministic builds and so will be left in place for the time being.
 
+Example usage:
     find ../gitian-builder/build -type f -executable | xargs python3 contrib/devtools/symbol-check.py
 '''
 import subprocess
@@ -124,7 +126,6 @@
 class CPPFilt(object):
     '''
     Demangle C++ symbol names.
-
     Use a pipe to the 'c++filt' command.
     '''
     def __init__(self):