Skip to content

Commit 245462b

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#22418: release: Remove gitian
ab9c342 release: remove gitian (fanquake) Pull request description: Note that this doesn't yet touch any glibc back compat related code. ACKs for top commit: laanwj: Code review ACK ab9c342 Tree-SHA512: 8e2fe3ec1097f54bb11ab9136b43818d90eab5dbb0a663ad6a552966ada4bdb49cc12ff4e66f0ec0ec5400bda5c81f3a3ce70a9ebb6fe1e0db612da9f00a51a7
2 parents d6034e4 + ab9c342 commit 245462b

16 files changed

+10
-894
lines changed

REVIEWERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
/doc/dependencies.md @fanquake
4242
/doc/developer-notes.md @laanwj
4343
/doc/files.md @hebasto
44-
/doc/gitian-building.md @laanwj
4544
/doc/reduce-memory.md @fanquake
4645
/doc/reduce-traffic.md @jonasschnelli
4746
/doc/release-process.md @laanwj
@@ -77,8 +76,7 @@
7776
/contrib/devtools/test-security-check.py @fanquake
7877
/contrib/devtools/symbol-check.py @fanquake
7978

80-
# Gitian/Guix
81-
/contrib/gitian-build.py @hebasto
79+
# Guix
8280
/contrib/guix/ @dongcarl
8381

8482
# Compatibility

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 librsvg2-bin libz-dev libtiff-tools libtinfo5 python3-setuptools xorriso"
1313
export XCODE_VERSION=12.1

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:20.04 # Check that Focal can cross-compile to win64 (Focal is used in the gitian build as well)
10+
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to win64
1111
export HOST=x86_64-w64-mingw32
1212
export DPKG_ADD_ARCH="i386"
1313
export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64 wine32 file"

contrib/README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,12 @@ The [Debian](/contrib/debian) subfolder contains the copyright file.
2626

2727
All other packaging related files can be found in the [bitcoin-core/packaging](https://github.com/bitcoin-core/packaging) repository.
2828

29-
### [Gitian-descriptors](/contrib/gitian-descriptors) ###
30-
Files used during the gitian build process. For more information about gitian, see the [the Bitcoin Core documentation repository](https://github.com/bitcoin-core/docs).
31-
3229
### [Builder keys](/contrib/builder-keys)
3330
PGP keys used for signing Bitcoin Core [release](/doc/release-process.md) results.
3431

3532
### [MacDeploy](/contrib/macdeploy) ###
3633
Scripts and notes for Mac builds.
3734

38-
### [Gitian-build](/contrib/gitian-build.py) ###
39-
Script for running full Gitian builds.
40-
4135
Test and Verify Tools
4236
---------------------
4337

contrib/devtools/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,17 @@ Perform basic security checks on a series of executables.
9898
symbol-check.py
9999
===============
100100

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

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

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

109-
Example usage after a gitian build:
109+
Example usage:
110110

111-
find ../gitian-builder/build -type f -executable | xargs python3 contrib/devtools/symbol-check.py
111+
find ../path/to/executables -type f -executable | xargs python3 contrib/devtools/symbol-check.py
112112

113113
If no errors occur the return value will be 0 and the output will be empty.
114114

contrib/gitian-build.py

Lines changed: 0 additions & 263 deletions
This file was deleted.

contrib/gitian-descriptors/assign_DISTNAME

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)