Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Drop make dist in gitian builds #18556

Merged
merged 2 commits into from Apr 28, 2020

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Apr 7, 2020

After the merge of #18331, the packaged source tarball is created by git archive, but the binaries are built from another one which is made by make dist.

With this PR the only source tarball, created by git archive, is used both for binaries building and for packaging to users.

Close #16588.
Close #18547.

As a good side-effect, #18349 becomes redundant.

Change in behavior

The following variables

bitcoin/configure.ac

Lines 2 to 6 in 1b151e3

define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 19)
define(_CLIENT_VERSION_REVISION, 99)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 0)

are no longer used for naming of directories and tarballs.

Instead of them the gitian descriptors use a git tag (if available) or a commit hash.


Also a small refactor commit picked from #18404.

@MarcoFalke
Copy link
Member

MarcoFalke commented Apr 7, 2020

Open-Close to re-run ci. See #15847 (comment)

@MarcoFalke MarcoFalke reopened this Apr 7, 2020
@MarcoFalke
Copy link
Member

MarcoFalke commented Apr 7, 2020

Travis run here: https://travis-ci.org/github/bitcoin/bitcoin/builds/672303495 . Not sure why it is not linked.

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 9, 2020

Gitian builds

File commit 2392566
(master)
commit b4fa57d
(master and this pull)
bitcoin-0.19.99-aarch64-linux-gnu-debug.tar.gz 828cc7165fcda6d7...
bitcoin-0.19.99-aarch64-linux-gnu.tar.gz 19f39430f6d6b932...
bitcoin-0.19.99-arm-linux-gnueabihf-debug.tar.gz b286dc1cfdd27aba...
bitcoin-0.19.99-arm-linux-gnueabihf.tar.gz 2e878c97fd9f751f...
bitcoin-0.19.99-osx-unsigned.dmg ba4c6e4dfe5f1a44...
bitcoin-0.19.99-osx64.tar.gz 7d187bef777061e0...
bitcoin-0.19.99-riscv64-linux-gnu-debug.tar.gz 9a7450aa0ee7e771...
bitcoin-0.19.99-riscv64-linux-gnu.tar.gz 164a69c7fdb34e11...
bitcoin-0.19.99-win64-debug.zip 5d8182cff04f0b23...
bitcoin-0.19.99-win64-setup-unsigned.exe 64a56adc8f69e4c6... 2f320688265f15b2...
bitcoin-0.19.99-win64.zip be63697d003bbb92...
bitcoin-0.19.99-x86_64-linux-gnu-debug.tar.gz 298322ed9ef88bec...
bitcoin-0.19.99-x86_64-linux-gnu.tar.gz b71bfcf87e8e358d...
bitcoin-0.19.99.tar.gz 7d4b6a6e5c51268e...
bitcoin-core-linux-0.20-res.yml f88a03e78fc38919... ec0e8e21d4bac4f1...
bitcoin-core-osx-0.20-res.yml 7c8b45a96259f8b1... 798cae85789e5097...
bitcoin-core-win-0.20-res.yml d16c64f2db26cf2a... f815f3f8ec6fb135...
linux-build.log ff9228e47e8fb766... b515a866cc8aa345...
osx-build.log f925455d7374a55b... ba767ffe658b893c...
win-build.log 4d8c4d669d323e8c... 0bb313ae3f7b71d1...
bitcoin-b4fa57dad9-aarch64-linux-gnu-debug.tar.gz b55d5ed52ea64b2b...
bitcoin-b4fa57dad9-aarch64-linux-gnu.tar.gz a78e083ad18f209f...
bitcoin-b4fa57dad9-arm-linux-gnueabihf-debug.tar.gz e83e074f2983477b...
bitcoin-b4fa57dad9-arm-linux-gnueabihf.tar.gz 3fe61bdb98de9674...
bitcoin-b4fa57dad9-osx-unsigned.dmg b45094afa0322d3b...
bitcoin-b4fa57dad9-osx64.tar.gz 5d6c98f1bdfbb911...
bitcoin-b4fa57dad9-riscv64-linux-gnu-debug.tar.gz 907d85f4fcf7cfb4...
bitcoin-b4fa57dad9-riscv64-linux-gnu.tar.gz ef74b2cc54d31ef9...
bitcoin-b4fa57dad9-win64-debug.zip b0590f848b123522...
bitcoin-b4fa57dad9-win64.zip 82b413e158c3a088...
bitcoin-b4fa57dad9-x86_64-linux-gnu-debug.tar.gz b1ad8353778c7a23...
bitcoin-b4fa57dad9-x86_64-linux-gnu.tar.gz 60b1f0e67adf01b7...
bitcoin-b4fa57dad9.tar.gz 17ce044af2423260...
bitcoin-core-linux-0.20-res.yml.diff 8ca8007585780772...
bitcoin-core-osx-0.20-res.yml.diff 5257bb82776b99ab...
bitcoin-core-win-0.20-res.yml.diff 5d0464db082827da...
linux-build.log.diff 79ddc7ede361340b...
osx-build.log.diff 3485ad58d5d4a3f2...
win-build.log.diff e745353551d763ef...

@laanwj
Copy link
Member

laanwj commented Apr 9, 2020

Concept ACK

@MarcoFalke MarcoFalke added this to the 0.21.0 milestone Apr 9, 2020
@MarcoFalke
Copy link
Member

MarcoFalke commented Apr 9, 2020

Looks like bitcoin-0.19.99-win64-setup-unsigned.exe is named incorrectly

@hebasto
Copy link
Member Author

hebasto commented Apr 11, 2020

Updated 8d0c980 -> 19a51a8 (pr18556.01 -> pr18556.02, diff):

Looks like bitcoin-0.19.99-win64-setup-unsigned.exe is named incorrectly

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 12, 2020

Gitian builds

File commit a5623ba
(master)
commit 745d47b
(master and this pull)
bitcoin-0.20.99-aarch64-linux-gnu-debug.tar.gz 9c82e51c7e47d727...
bitcoin-0.20.99-aarch64-linux-gnu.tar.gz edcb63d1eb5495e9...
bitcoin-0.20.99-arm-linux-gnueabihf-debug.tar.gz d5d4a5345f86af70...
bitcoin-0.20.99-arm-linux-gnueabihf.tar.gz bfdbf761a2b9c50e...
bitcoin-0.20.99-osx-unsigned.dmg b5a64eac14885b58...
bitcoin-0.20.99-osx64.tar.gz 7c3d65d5be56192d...
bitcoin-0.20.99-riscv64-linux-gnu-debug.tar.gz 12b39df1f36d643d...
bitcoin-0.20.99-riscv64-linux-gnu.tar.gz ab41831e0fe28459...
bitcoin-0.20.99-win64-debug.zip 1728364737f21cda...
bitcoin-0.20.99-win64-setup-unsigned.exe 2b0b438a64b4a82a...
bitcoin-0.20.99-win64.zip bc40c8a3cde15085...
bitcoin-0.20.99-x86_64-linux-gnu-debug.tar.gz 02ce0e29960a563b...
bitcoin-0.20.99-x86_64-linux-gnu.tar.gz 6c74ee5691689103...
bitcoin-0.20.99.tar.gz 45fea2ff2b455258...
bitcoin-core-linux-0.21-res.yml 2fde331d1835beaf... a7480e7c4cc7bc40...
bitcoin-core-osx-0.21-res.yml 3e6d3ca9c4fb21bd... 0f4498dc228d6be4...
bitcoin-core-win-0.21-res.yml 0ccbdabff23646b2... bd9f8d1971e0fd5d...
linux-build.log 8b06a9b50657a83b... d3f5638c2d81a39a...
osx-build.log a6b34b7c4e79ab71... d6c12a74941a7763...
win-build.log a755498086d9f0c1... 3eaffb75d3d6e49b...
bitcoin-745d47b52a-aarch64-linux-gnu-debug.tar.gz 3b249d73b23a5665...
bitcoin-745d47b52a-aarch64-linux-gnu.tar.gz 1f54a97a1163b02f...
bitcoin-745d47b52a-arm-linux-gnueabihf-debug.tar.gz 8c041518b0699cfb...
bitcoin-745d47b52a-arm-linux-gnueabihf.tar.gz 03bab2de9457c0ea...
bitcoin-745d47b52a-osx-unsigned.dmg 3f3d6784e64fc93d...
bitcoin-745d47b52a-osx64.tar.gz abe4d7eb26855303...
bitcoin-745d47b52a-riscv64-linux-gnu-debug.tar.gz 40a5a570456ba73b...
bitcoin-745d47b52a-riscv64-linux-gnu.tar.gz 95fbedcdfe2e9c99...
bitcoin-745d47b52a-win64-debug.zip fb5f41a5f3664c4f...
bitcoin-745d47b52a-win64-setup-unsigned.exe 4e499986b3cbdc4c...
bitcoin-745d47b52a-win64.zip f0a4f6567520d3f4...
bitcoin-745d47b52a-x86_64-linux-gnu-debug.tar.gz acd443b1de2fff4a...
bitcoin-745d47b52a-x86_64-linux-gnu.tar.gz 13a698a94989a79b...
bitcoin-745d47b52a.tar.gz c4c15f219cf269e8...
bitcoin-core-linux-0.21-res.yml.diff 54a69c3c6a6ee03d...
bitcoin-core-osx-0.21-res.yml.diff 9282af9db105c564...
bitcoin-core-win-0.21-res.yml.diff 19e19a398cbe95a7...
linux-build.log.diff b1296be6dd039366...
osx-build.log.diff 69e5abb00f1b5f4d...
win-build.log.diff 529285c31d38f7e9...

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 12, 2020

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

if [[ $RECENT_TAG == v* ]]; then
VERSION=${RECENT_TAG:1}
else
VERSION=$RECENT_TAG
Copy link
Member

@MarcoFalke MarcoFalke Apr 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this condition for?

Copy link
Member Author

@hebasto hebasto Apr 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We tag releases with the prepended "v", like "v0.20.0rc1".

This if statement just removes it on purpose to include the version string (e.g., "0.20.0rc1") into file names.

Copy link
Member

@MarcoFalke MarcoFalke Apr 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I meant the else branch

Copy link
Member Author

@hebasto hebasto Apr 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if [ $RECENT_TAG = $(git describe HEAD) ]; then
  if [[ $RECENT_TAG == v* ]]; then
    VERSION=${RECENT_TAG:1} # Set VERSION to release (with "v") tagged commit
  else
    VERSION=$RECENT_TAG # Set VERSION to non-release (without "v") tagged commit
  fi
else
  VERSION=$(git rev-parse --short HEAD) # Set VERSION to untagged commit
fi
DISTNAME=bitcoin-${VERSION} # Use VERSION in file names

Copy link
Member

@MarcoFalke MarcoFalke Apr 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why would there be a non-v* tagged commit? This should probably be an assert(false)?

Copy link
Member Author

@hebasto hebasto Apr 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is convenient for making gitian test builds. At least, for me :)

Copy link
Member

@MarcoFalke MarcoFalke Apr 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, will leave this for other reviewers to bikeshed :)

Copy link
Member

@fanquake fanquake Apr 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is convenient for making gitian test builds. At least, for me :)

I mentioned on IRC, however I'll just reiterate here, I'd definitely normally NACK unclear/undocumented additions to our build system / release scripts. However given that this should be removed in a follow up PR I think it's ok as is. If you've got patches that are helpful for testing, you can maintain them locally, but please don't just bundle them into a PR along with other changes.

Copy link
Member Author

@hebasto hebasto Apr 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The rationale for adding that addition:
Currently, the gitian-build.py script allows to make builds from personal repos by passing the --url command line argument. Also a branch could be chosen. This change adds an option to point the script to a tagged commit on personal repo as well.

@MarcoFalke
Copy link
Member

MarcoFalke commented Apr 17, 2020

ACK, can squash the first two commits?

@hebasto
Copy link
Member Author

hebasto commented Apr 17, 2020

Updated 19a51a8 -> 2aa48ed (pr18556.02 -> pr18556.03, diff):

ACK, can squash the first two commits?

@dongcarl
Copy link
Contributor

dongcarl commented Apr 22, 2020

@hebasto I've opened #18741 based on this! I think that perhaps ab65fe2 could be pulled into this PR, but it kind of doesn't make sense without the Guix changes, so I'll leave that decision up to you ☺️

@dongcarl
Copy link
Contributor

dongcarl commented Apr 22, 2020

ACK 2aa48ed
Don't want to delay merging this so let's just do the Guix parts afterwards in #18741

@adamjonas
Copy link
Member

adamjonas commented Apr 24, 2020

This should close #16588 if I'm not mistaken.

@hebasto
Copy link
Member Author

hebasto commented Apr 24, 2020

This should close #16588 if I'm not mistaken.

The OP has been updated.

@MarcoFalke
Copy link
Member

MarcoFalke commented Apr 24, 2020

@fanquake Anything left to do here?

Copy link
Member

@fanquake fanquake left a comment

ACK 2aa48ed - I've had a quick look over this, and don't want to block merging if this actually gets as closer to finally having this all sorted out. Obviously we've still got #18741, and after speaking to Carl this morning, there will likely be even more changes after that (not Guix specific).

if [[ $RECENT_TAG == v* ]]; then
VERSION=${RECENT_TAG:1}
else
VERSION=$RECENT_TAG
Copy link
Member

@fanquake fanquake Apr 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is convenient for making gitian test builds. At least, for me :)

I mentioned on IRC, however I'll just reiterate here, I'd definitely normally NACK unclear/undocumented additions to our build system / release scripts. However given that this should be removed in a follow up PR I think it's ok as is. If you've got patches that are helpful for testing, you can maintain them locally, but please don't just bundle them into a PR along with other changes.

for descriptor in $(git ls-files -- 'contrib/gitian-descriptors/*.yml')
do
echo
Copy link
Member

@fanquake fanquake Apr 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know is this is expected or changed here, but running this I see:

test/lint/lint-shell.sh
2020/04/25 19:36:23 unknown command "contrib/gitian-descriptors/gitian-linux.yml" for "yq"
2020/04/25 19:36:23 unknown command "contrib/gitian-descriptors/gitian-osx-signer.yml" for "yq"
2020/04/25 19:36:23 unknown command "contrib/gitian-descriptors/gitian-osx.yml" for "yq"
2020/04/25 19:36:23 unknown command "contrib/gitian-descriptors/gitian-win-signer.yml" for "yq"
2020/04/25 19:36:23 unknown command "contrib/gitian-descriptors/gitian-win.yml" for "yq"

Copy link
Member Author

@hebasto hebasto Apr 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could #17361 help? Did you have yq installed?

Copy link
Member

@fanquake fanquake Apr 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you have yq installed?

Yes. yq version 3.3.0

Copy link
Member Author

@hebasto hebasto Apr 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you have yq installed?

Yes. yq version 3.3.0

Not that but this one:

$ brew install python-yq

Ref: https://pypi.org/project/yq/

@fanquake fanquake merged commit 65fb3df into bitcoin:master Apr 28, 2020
2 checks passed
@hebasto hebasto deleted the 20200406-drop-dist branch Apr 28, 2020
sidhujag pushed a commit to syscoin/syscoin that referenced this issue Apr 28, 2020
2aa48ed refactor: Drop unused ${WRAP_DIR}/${HOST} directory (Hennadii Stepanov)
1362be0 build: Drop make dist in gitian builds (Hennadii Stepanov)

Pull request description:

  After the merge of bitcoin#18331, the packaged source tarball is created by `git archive`, but the binaries are built from another one which is made by `make dist`.

  With this PR the only source tarball, created by `git archive`, is used both for binaries building and for packaging to users.

  Close bitcoin#16588.
  Close bitcoin#18547.

  As a good side-effect, bitcoin#18349 becomes redundant.

  **Change in behavior**

  The following variables https://github.com/bitcoin/bitcoin/blob/1b151e3ffce7c1a2ee46bf280cc1d96775d1f91e/configure.ac#L2-L6

  are no longer used for naming of directories and tarballs.

  Instead of them the gitian descriptors use a git tag (if available) or a commit hash.

  ---

  Also a small refactor commit picked from bitcoin#18404.

ACKs for top commit:
  dongcarl:
    ACK 2aa48ed
  MarcoFalke:
    ACK 2aa48ed
  fanquake:
    ACK 2aa48ed - I've had a quick look over this, and don't want to block merging if this actually gets as closer to finally having this all sorted out. Obviously we've still got bitcoin#18741, and after speaking to Carl this morning, there will likely be even more changes after that (not Guix specific).

Tree-SHA512: d3b16f87e48d1790a3264940c28acd5d881bfd10f3ce94fb0c8a6af76d8039289d01e0cd4972adac49ae24362857251f6c1e5e09e3e9fbf636c10708b4015a7c
fanquake added a commit that referenced this issue May 6, 2020
bfe1ba2 rel-builds: Specify core.abbrev for git-rev-parse (Carl Dong)
27e63e0 build: Accomodate makensis v2.x (Carl Dong)
1f2c39a guix: Remove logical cores requirement (Carl Dong)
a4f6ffa lint: Also enable source statements for non-gitian (Carl Dong)
d256f91 rel-builds: Directly deploy win installer to OUTDIR (Carl Dong)
fa791da nsis: Specify OutFile path only once (Carl Dong)
1470160 guix: Expose GIT_COMMON_DIR in container as readonly (Carl Dong)
f5a6ac4 guix: Make source tarball using git-archive (Carl Dong)
395c113 gitian: Limit sourced script to just assignments (Carl Dong)

Pull request description:

  Based on: #18556
  Related: #17595 (comment)

ACKs for top commit:
  fanquake:
    ACK bfe1ba2 - I agree with Carl, and am going to merge this. I'd like for Linux Guix builds to be working again, and we can rebase #18818.

Tree-SHA512: c87ada7e3de17ca0b692a91029b86573442ded5780fc081c214773f6b374a0cdbeaf6f6898c36669c2e247ee32aa7f82defb1180f8decac52c65f0c140f18674
luke-jr pushed a commit to luke-jr/bitcoin that referenced this issue May 7, 2020
luke-jr pushed a commit to luke-jr/bitcoin that referenced this issue May 7, 2020
This commit removes the directory that is no longer used since bitcoin#16667.

Github-Pull: bitcoin#18556
Rebased-From: 2aa48ed
luke-jr pushed a commit to luke-jr/bitcoin that referenced this issue May 7, 2020
luke-jr pushed a commit to luke-jr/bitcoin that referenced this issue May 7, 2020
This commit removes the directory that is no longer used since bitcoin#16667.

Github-Pull: bitcoin#18556
Rebased-From: 2aa48ed
sidhujag pushed a commit to syscoin/syscoin that referenced this issue May 12, 2020
bfe1ba2 rel-builds: Specify core.abbrev for git-rev-parse (Carl Dong)
27e63e0 build: Accomodate makensis v2.x (Carl Dong)
1f2c39a guix: Remove logical cores requirement (Carl Dong)
a4f6ffa lint: Also enable source statements for non-gitian (Carl Dong)
d256f91 rel-builds: Directly deploy win installer to OUTDIR (Carl Dong)
fa791da nsis: Specify OutFile path only once (Carl Dong)
1470160 guix: Expose GIT_COMMON_DIR in container as readonly (Carl Dong)
f5a6ac4 guix: Make source tarball using git-archive (Carl Dong)
395c113 gitian: Limit sourced script to just assignments (Carl Dong)

Pull request description:

  Based on: bitcoin#18556
  Related: bitcoin#17595 (comment)

ACKs for top commit:
  fanquake:
    ACK bfe1ba2 - I agree with Carl, and am going to merge this. I'd like for Linux Guix builds to be working again, and we can rebase bitcoin#18818.

Tree-SHA512: c87ada7e3de17ca0b692a91029b86573442ded5780fc081c214773f6b374a0cdbeaf6f6898c36669c2e247ee32aa7f82defb1180f8decac52c65f0c140f18674
luke-jr pushed a commit to luke-jr/bitcoin that referenced this issue May 14, 2020
luke-jr pushed a commit to luke-jr/bitcoin that referenced this issue May 14, 2020
This commit removes the directory that is no longer used since bitcoin#16667.

Github-Pull: bitcoin#18556
Rebased-From: 2aa48ed
UdjinM6 pushed a commit to UdjinM6/dash that referenced this issue Oct 23, 2021
2aa48ed refactor: Drop unused ${WRAP_DIR}/${HOST} directory (Hennadii Stepanov)
1362be0 build: Drop make dist in gitian builds (Hennadii Stepanov)

Pull request description:

  After the merge of bitcoin#18331, the packaged source tarball is created by `git archive`, but the binaries are built from another one which is made by `make dist`.

  With this PR the only source tarball, created by `git archive`, is used both for binaries building and for packaging to users.

  Close bitcoin#16588.
  Close bitcoin#18547.

  As a good side-effect, bitcoin#18349 becomes redundant.

  **Change in behavior**

  The following variables https://github.com/bitcoin/bitcoin/blob/1b151e3ffce7c1a2ee46bf280cc1d96775d1f91e/configure.ac#L2-L6

  are no longer used for naming of directories and tarballs.

  Instead of them the gitian descriptors use a git tag (if available) or a commit hash.

  ---

  Also a small refactor commit picked from bitcoin#18404.

ACKs for top commit:
  dongcarl:
    ACK 2aa48ed
  MarcoFalke:
    ACK 2aa48ed
  fanquake:
    ACK 2aa48ed - I've had a quick look over this, and don't want to block merging if this actually gets as closer to finally having this all sorted out. Obviously we've still got bitcoin#18741, and after speaking to Carl this morning, there will likely be even more changes after that (not Guix specific).

Tree-SHA512: d3b16f87e48d1790a3264940c28acd5d881bfd10f3ce94fb0c8a6af76d8039289d01e0cd4972adac49ae24362857251f6c1e5e09e3e9fbf636c10708b4015a7c
UdjinM6 pushed a commit to UdjinM6/dash that referenced this issue Oct 23, 2021
bfe1ba2 rel-builds: Specify core.abbrev for git-rev-parse (Carl Dong)
27e63e0 build: Accomodate makensis v2.x (Carl Dong)
1f2c39a guix: Remove logical cores requirement (Carl Dong)
a4f6ffa lint: Also enable source statements for non-gitian (Carl Dong)
d256f91 rel-builds: Directly deploy win installer to OUTDIR (Carl Dong)
fa791da nsis: Specify OutFile path only once (Carl Dong)
1470160 guix: Expose GIT_COMMON_DIR in container as readonly (Carl Dong)
f5a6ac4 guix: Make source tarball using git-archive (Carl Dong)
395c113 gitian: Limit sourced script to just assignments (Carl Dong)

Pull request description:

  Based on: bitcoin#18556
  Related: bitcoin#17595 (comment)

ACKs for top commit:
  fanquake:
    ACK bfe1ba2 - I agree with Carl, and am going to merge this. I'd like for Linux Guix builds to be working again, and we can rebase bitcoin#18818.

Tree-SHA512: c87ada7e3de17ca0b692a91029b86573442ded5780fc081c214773f6b374a0cdbeaf6f6898c36669c2e247ee32aa7f82defb1180f8decac52c65f0c140f18674
UdjinM6 pushed a commit to UdjinM6/dash that referenced this issue Oct 23, 2021
2aa48ed refactor: Drop unused ${WRAP_DIR}/${HOST} directory (Hennadii Stepanov)
1362be0 build: Drop make dist in gitian builds (Hennadii Stepanov)

Pull request description:

  After the merge of bitcoin#18331, the packaged source tarball is created by `git archive`, but the binaries are built from another one which is made by `make dist`.

  With this PR the only source tarball, created by `git archive`, is used both for binaries building and for packaging to users.

  Close bitcoin#16588.
  Close bitcoin#18547.

  As a good side-effect, bitcoin#18349 becomes redundant.

  **Change in behavior**

  The following variables https://github.com/bitcoin/bitcoin/blob/1b151e3ffce7c1a2ee46bf280cc1d96775d1f91e/configure.ac#L2-L6

  are no longer used for naming of directories and tarballs.

  Instead of them the gitian descriptors use a git tag (if available) or a commit hash.

  ---

  Also a small refactor commit picked from bitcoin#18404.

ACKs for top commit:
  dongcarl:
    ACK 2aa48ed
  MarcoFalke:
    ACK 2aa48ed
  fanquake:
    ACK 2aa48ed - I've had a quick look over this, and don't want to block merging if this actually gets as closer to finally having this all sorted out. Obviously we've still got bitcoin#18741, and after speaking to Carl this morning, there will likely be even more changes after that (not Guix specific).

Tree-SHA512: d3b16f87e48d1790a3264940c28acd5d881bfd10f3ce94fb0c8a6af76d8039289d01e0cd4972adac49ae24362857251f6c1e5e09e3e9fbf636c10708b4015a7c
UdjinM6 pushed a commit to UdjinM6/dash that referenced this issue Oct 23, 2021
bfe1ba2 rel-builds: Specify core.abbrev for git-rev-parse (Carl Dong)
27e63e0 build: Accomodate makensis v2.x (Carl Dong)
1f2c39a guix: Remove logical cores requirement (Carl Dong)
a4f6ffa lint: Also enable source statements for non-gitian (Carl Dong)
d256f91 rel-builds: Directly deploy win installer to OUTDIR (Carl Dong)
fa791da nsis: Specify OutFile path only once (Carl Dong)
1470160 guix: Expose GIT_COMMON_DIR in container as readonly (Carl Dong)
f5a6ac4 guix: Make source tarball using git-archive (Carl Dong)
395c113 gitian: Limit sourced script to just assignments (Carl Dong)

Pull request description:

  Based on: bitcoin#18556
  Related: bitcoin#17595 (comment)

ACKs for top commit:
  fanquake:
    ACK bfe1ba2 - I agree with Carl, and am going to merge this. I'd like for Linux Guix builds to be working again, and we can rebase bitcoin#18818.

Tree-SHA512: c87ada7e3de17ca0b692a91029b86573442ded5780fc081c214773f6b374a0cdbeaf6f6898c36669c2e247ee32aa7f82defb1180f8decac52c65f0c140f18674
UdjinM6 pushed a commit to UdjinM6/dash that referenced this issue Dec 4, 2021
2aa48ed refactor: Drop unused ${WRAP_DIR}/${HOST} directory (Hennadii Stepanov)
1362be0 build: Drop make dist in gitian builds (Hennadii Stepanov)

Pull request description:

  After the merge of bitcoin#18331, the packaged source tarball is created by `git archive`, but the binaries are built from another one which is made by `make dist`.

  With this PR the only source tarball, created by `git archive`, is used both for binaries building and for packaging to users.

  Close bitcoin#16588.
  Close bitcoin#18547.

  As a good side-effect, bitcoin#18349 becomes redundant.

  **Change in behavior**

  The following variables https://github.com/bitcoin/bitcoin/blob/1b151e3ffce7c1a2ee46bf280cc1d96775d1f91e/configure.ac#L2-L6

  are no longer used for naming of directories and tarballs.

  Instead of them the gitian descriptors use a git tag (if available) or a commit hash.

  ---

  Also a small refactor commit picked from bitcoin#18404.

ACKs for top commit:
  dongcarl:
    ACK 2aa48ed
  MarcoFalke:
    ACK 2aa48ed
  fanquake:
    ACK 2aa48ed - I've had a quick look over this, and don't want to block merging if this actually gets as closer to finally having this all sorted out. Obviously we've still got bitcoin#18741, and after speaking to Carl this morning, there will likely be even more changes after that (not Guix specific).

Tree-SHA512: d3b16f87e48d1790a3264940c28acd5d881bfd10f3ce94fb0c8a6af76d8039289d01e0cd4972adac49ae24362857251f6c1e5e09e3e9fbf636c10708b4015a7c
UdjinM6 pushed a commit to UdjinM6/dash that referenced this issue Dec 4, 2021
bfe1ba2 rel-builds: Specify core.abbrev for git-rev-parse (Carl Dong)
27e63e0 build: Accomodate makensis v2.x (Carl Dong)
1f2c39a guix: Remove logical cores requirement (Carl Dong)
a4f6ffa lint: Also enable source statements for non-gitian (Carl Dong)
d256f91 rel-builds: Directly deploy win installer to OUTDIR (Carl Dong)
fa791da nsis: Specify OutFile path only once (Carl Dong)
1470160 guix: Expose GIT_COMMON_DIR in container as readonly (Carl Dong)
f5a6ac4 guix: Make source tarball using git-archive (Carl Dong)
395c113 gitian: Limit sourced script to just assignments (Carl Dong)

Pull request description:

  Based on: bitcoin#18556
  Related: bitcoin#17595 (comment)

ACKs for top commit:
  fanquake:
    ACK bfe1ba2 - I agree with Carl, and am going to merge this. I'd like for Linux Guix builds to be working again, and we can rebase bitcoin#18818.

Tree-SHA512: c87ada7e3de17ca0b692a91029b86573442ded5780fc081c214773f6b374a0cdbeaf6f6898c36669c2e247ee32aa7f82defb1180f8decac52c65f0c140f18674
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
7 participants