Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

snap: reenable i386, arm64, armhf architecture publishing#10386

Merged
General-Beck merged 16 commits into
masterfrom
a5-snap-archs
Feb 25, 2019
Merged

snap: reenable i386, arm64, armhf architecture publishing#10386
General-Beck merged 16 commits into
masterfrom
a5-snap-archs

Conversation

@5chdn
Copy link
Copy Markdown
Contributor

@5chdn 5chdn commented Feb 20, 2019

No description provided.

@5chdn 5chdn added A0-pleasereview 🤓 Pull request needs code review. M1-ci 🙉 Continuous integration. labels Feb 20, 2019
@5chdn 5chdn added this to the 2.4 milestone Feb 20, 2019
Comment thread .gitlab-ci.yml Outdated
Comment thread .gitlab-ci.yml
@5chdn 5chdn added the A1-onice 🌨 Pull request is reviewed well, but should not yet be merged. label Feb 20, 2019
@5chdn 5chdn added B1-patch-beta 🕷🕷 B0-patch-stable 🕷 Pull request should also be back-ported to the stable branch. and removed A1-onice 🌨 Pull request is reviewed well, but should not yet be merged. labels Feb 20, 2019
@TriplEight
Copy link
Copy Markdown
Collaborator

not sure though, if all these builds can be done in the same Docker image, have to check first.

@5chdn 5chdn added A8-looksgood 🦄 Pull request is reviewed well. A1-onice 🌨 Pull request is reviewed well, but should not yet be merged. and removed A0-pleasereview 🤓 Pull request needs code review. labels Feb 20, 2019
@General-Beck General-Beck self-assigned this Feb 20, 2019
@General-Beck
Copy link
Copy Markdown
Contributor

@ElOpio any ideas? https://gitlab.parity.io/parity/parity-ethereum/-/jobs/124182
other tasks with other architectures were built successfully

@5chdn
Copy link
Copy Markdown
Contributor Author

5chdn commented Feb 21, 2019

@General-Beck this also fails on nightly, so probably unrelated

@5chdn 5chdn modified the milestones: 2.4, 2.5 Feb 21, 2019
@5chdn 5chdn modified the milestones: 2.6, 2.5 Feb 21, 2019
Copy link
Copy Markdown
Collaborator

@TriplEight TriplEight left a comment

Choose a reason for hiding this comment

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

ready to merge,
publish-snap issue resolved

Comment thread .gitlab-ci.yml

image: parity/rust:gitlab-ci

image: parity/rust-parity-ethereum-build:xenial
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

what's the logic behind changing this now?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

this docker image has been tested,
it's the preparation for using cache in docker volumes

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

new CI images

Comment thread .gitlab-ci.yml
- artifacts/

.determine_version: &determine_version
- VERSION="$(sed -r -n '1,/^version/s/^version = "([^"]+)".*$/\1/p' Cargo.toml)"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is this removed?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

was used only in publish-snap.sh so moved there.
Is there a reason for it to stay here?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

used only for publish snap

Comment thread .gitlab-ci.yml
- build-linux
tags:
- rust-stable
- linux-docker
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why linux-docker?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

clean up the tags

else
./parity tools hash $binary > $binary.sha3
fi
rhash --sha256 $binary -o $binary.sha256 #do we still need this hash (SHA2)?
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

SHA256 is used for Vanity Service and Homebrew (Releases) And One-line Installer

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

👍

# prepare variables
VERSION=v"$(sed -r -n '1,/^version/s/^version = "([^"]+)".*$/\1/p' Cargo.toml)"
SNAP_PACKAGE="parity_"$VERSION"_"$BUILD_ARCH".snap"
CARGO_TARGET="$(ls artifacts)"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

What? ls artifacts gives a reliable CARGO_TARGET?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

yes, from artifacts dir

cp -v ethkey $SNAPCRAFT_PART_INSTALL/usr/bin/ethkey
cp -v ethstore $SNAPCRAFT_PART_INSTALL/usr/bin/ethstore
cp -v whisper $SNAPCRAFT_PART_INSTALL/usr/bin/whisper
stage-packages: [libc6, libudev1, libstdc++6, cmake, libdb5.3]
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

we added libc6 because it was failling without. It's working now?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

yes

Copy link
Copy Markdown
Contributor

@gabreal gabreal left a comment

Choose a reason for hiding this comment

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

haven't checked the snap config

./parity tools hash $binary > $binary.sha3
fi
rhash --sha256 $binary -o $binary.sha256 #do we still need this hash (SHA2)?
rhash --sha3-256 $binary -o $binary.sha3
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

hashes are different, is that okay?

% target/release/parity tools hash target/release/parity
58b49924c583b45871cac4077da8f99820a684df8cca9a81c742080e991f671d
% rhash --sha3-256 target/release/parity
95fcba97a2059bbae16f997c3ea7b6c6c0f9ef5990313f55eb8536a1b3bef9e3  target/release/parity
% rhash --sha256 target/release/parity                
19c7ac31b99f5a45e6a4236367df18467321a3fc9f492c19f80cede098d47abf  target/release/parity

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

we can't use parity to calculate the hash for other architectures

Comment thread scripts/gitlab/build-unix.sh Outdated
Comment thread .gitlab-ci.yml

image: parity/rust:gitlab-ci

image: parity/rust-parity-ethereum-build:xenial
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

would prefer a separate pr for that, just in case one has to revert.

@soc1c soc1c removed the A1-onice 🌨 Pull request is reviewed well, but should not yet be merged. label Feb 22, 2019
@soc1c
Copy link
Copy Markdown
Contributor

soc1c commented Feb 22, 2019

Needs a 2nd review.

@TriplEight
Copy link
Copy Markdown
Collaborator

android parity-clib compiles now: https://gitlab.parity.io/parity/parity-ethereum/pipelines/31445

@TriplEight
Copy link
Copy Markdown
Collaborator

The latest pipeline is all green: https://gitlab.parity.io/parity/parity-ethereum/pipelines/31461

@soc1c soc1c added the B9-blocker 🚧 This pull request blocks the next release from happening. Use only in extreme cases. label Feb 25, 2019
@General-Beck General-Beck merged commit bceb883 into master Feb 25, 2019
@General-Beck General-Beck deleted the a5-snap-archs branch February 25, 2019 11:57
HCastano pushed a commit to HCastano/parity-ethereum that referenced this pull request Feb 25, 2019
…um#10386)

* snap: reenable i386, arm64, armhf architecture publishing

* gitlab: fix indent

* gitlab: fix yml syntax

* Linker for crosscomile

* fix target to linker

* new docker image

* fix lint, add build to this PR

* calc SHA3 using rhash

* add new images for i386, armhf

* show snap target & artifacts

* set CARGO_TARGET for publish snap

* move detect Version to publish snap

* rm libc6 dep from snap-template up pub-snap script

* clean up cargo config before add linker

* move linker config to docker images
HCastano pushed a commit to HCastano/parity-ethereum that referenced this pull request Feb 25, 2019
…um#10386)

* snap: reenable i386, arm64, armhf architecture publishing

* gitlab: fix indent

* gitlab: fix yml syntax

* Linker for crosscomile

* fix target to linker

* new docker image

* fix lint, add build to this PR

* calc SHA3 using rhash

* add new images for i386, armhf

* show snap target & artifacts

* set CARGO_TARGET for publish snap

* move detect Version to publish snap

* rm libc6 dep from snap-template up pub-snap script

* clean up cargo config before add linker

* move linker config to docker images
HCastano added a commit that referenced this pull request Feb 25, 2019
* no-git for publish jobs, empty artifacts dir (#10393)

* no-git for publish jobs, empty artifacts dir

* fix syntax

* prettiness

* fix prettiness

* should get rid of git in publishing

* snap: reenable i386, arm64, armhf architecture publishing (#10386)

* snap: reenable i386, arm64, armhf architecture publishing

* gitlab: fix indent

* gitlab: fix yml syntax

* Linker for crosscomile

* fix target to linker

* new docker image

* fix lint, add build to this PR

* calc SHA3 using rhash

* add new images for i386, armhf

* show snap target & artifacts

* set CARGO_TARGET for publish snap

* move detect Version to publish snap

* rm libc6 dep from snap-template up pub-snap script

* clean up cargo config before add linker

* move linker config to docker images

* tx pool: always accept local transactions (#10375)

* tx pool: always accept local transactions

* tx pool: `choose` local txs with same sender and nonce

* Fix to_pod storage trie value decoding (#10368)
HCastano added a commit that referenced this pull request Feb 25, 2019
* no-git for publish jobs, empty artifacts dir (#10393)

* no-git for publish jobs, empty artifacts dir

* fix syntax

* prettiness

* fix prettiness

* should get rid of git in publishing

* Fix to_pod storage trie value decoding (#10368)

* snap: reenable i386, arm64, armhf architecture publishing (#10386)

* snap: reenable i386, arm64, armhf architecture publishing

* gitlab: fix indent

* gitlab: fix yml syntax

* Linker for crosscomile

* fix target to linker

* new docker image

* fix lint, add build to this PR

* calc SHA3 using rhash

* add new images for i386, armhf

* show snap target & artifacts

* set CARGO_TARGET for publish snap

* move detect Version to publish snap

* rm libc6 dep from snap-template up pub-snap script

* clean up cargo config before add linker

* move linker config to docker images
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

A8-looksgood 🦄 Pull request is reviewed well. B0-patch-stable 🕷 Pull request should also be back-ported to the stable branch. B9-blocker 🚧 This pull request blocks the next release from happening. Use only in extreme cases. M1-ci 🙉 Continuous integration.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants