Skip to content

Commit 18da3bc

Browse files
authored
Merge pull request #2293 from jamescowens/deprecation_remove_gitian
release: Remove gitian
2 parents 82aea6c + b40d43b commit 18da3bc

File tree

48 files changed

+59
-1760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+59
-1760
lines changed

ci/test/00_setup_env_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_macos_cross
10-
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos (Focal is used in the gitian build as well)
10+
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos
1111
export HOST=x86_64-apple-darwin18
1212
export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools libtinfo5 python3-dev python3-setuptools xorriso"
1313
export XCODE_VERSION=12.1

ci/test/00_setup_env_win32.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_win32
10-
export DOCKER_NAME_TAG=ubuntu:18.04 # Check that bionic can cross-compile to win32 (bionic is used in the gitian build as well)
10+
export DOCKER_NAME_TAG=ubuntu:18.04 # Check that bionic can cross-compile to win32
1111
export HOST=i686-w64-mingw32
1212
export PACKAGES="python3 nsis g++-mingw-w64-i686 wine-binfmt wine32"
1313
export RUN_UNIT_TESTS=true

ci/test/00_setup_env_win64.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_win64
10-
export DOCKER_NAME_TAG=ubuntu:18.04 # Check that bionic can cross-compile to win64 (bionic is used in the gitian build as well)
10+
export DOCKER_NAME_TAG=ubuntu:18.04 # Check that bionic can cross-compile to win64
1111
export HOST=x86_64-w64-mingw32
1212
export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64"
1313
export GOAL=""

contrib/devtools/README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,14 @@ Perform basic security checks on a series of executables.
9797
symbol-check.py
9898
===============
9999

100-
A script to check that the executables produced by gitian only contain
101-
certain symbols and are only linked against allowed libraries.
100+
A script to check that release executables only contain certain symbols and are only linked against
101+
allowed libraries.
102102

103103
For Linux this means checking for allowed gcc, glibc and libstdc++ version symbols.
104104
This makes sure they are still compatible with the minimum supported distribution versions.
105105

106106
For macOS and Windows we check that the executables are only linked against libraries we allow.
107107

108-
Example usage after a gitian build:
109-
110-
find ../gitian-builder/build -type f -executable | xargs python3 contrib/devtools/symbol-check.py
111-
112108
If no errors occur the return value will be 0 and the output will be empty.
113109

114110
If there are any errors the return value will be 1 and output like this will be printed:

contrib/devtools/symbol-check.py

100755100644
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
A script to check that the executables produced by gitian only contain
77
certain symbols and are only linked against allowed libraries.
88
9-
Example usage:
9+
NOTE: gitian is no longer used and this script is not currently being maintained. It may be used in the future
10+
with Guix deterministic builds and so will be left in place for the time being.
1011
12+
Example usage:
1113
find ../gitian-builder/build -type f -executable | xargs python3 contrib/devtools/symbol-check.py
1214
'''
1315
import subprocess
@@ -124,7 +126,6 @@
124126
class CPPFilt(object):
125127
'''
126128
Demangle C++ symbol names.
127-
128129
Use a pipe to the 'c++filt' command.
129130
'''
130131
def __init__(self):

0 commit comments

Comments
 (0)