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

Update Parity stable to 1.9.7 + Backports #8456

Merged
merged 5 commits into from
Apr 23, 2018
Merged

Update Parity stable to 1.9.7 + Backports #8456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d89093
Update Parity stable to 1.9.7
5chdn Apr 20, 2018
fe819e9
Allow 32 bit pipelines to fail (#8454)
5chdn Apr 21, 2018
f439d3a
Update wasmi (#8452)
pepyakin Apr 21, 2018
743d392
Revert Cargo lock update from master
5chdn Apr 21, 2018
99bca18
Fix Cargo.lock
5chdn Apr 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cache:
paths:
- target/
untracked: true
linux-stable:
linux-ubuntu:
stage: build
image: parity/rust:gitlab-ci
only:
Expand All @@ -32,7 +32,7 @@ linux-stable:
paths:
- parity.zip
name: "stable-x86_64-unknown-linux-gnu_parity"
linux-stable-debian:
linux-debian:
stage: build
image: parity/rust-debian:gitlab-ci
only:
Expand Down Expand Up @@ -81,6 +81,7 @@ linux-i686:
paths:
- parity.zip
name: "i686-unknown-linux-gnu"
allow_failure: true
linux-armv7:
stage: build
image: parity/rust-armv7:gitlab-ci
Expand All @@ -97,6 +98,7 @@ linux-armv7:
paths:
- parity.zip
name: "armv7_unknown_linux_gnueabihf_parity"
allow_failure: true
linux-arm:
stage: build
image: parity/rust-arm:gitlab-ci
Expand All @@ -113,6 +115,7 @@ linux-arm:
paths:
- parity.zip
name: "arm-unknown-linux-gnueabihf_parity"
allow_failure: true
linux-aarch64:
stage: build
image: parity/rust-arm64:gitlab-ci
Expand Down
54 changes: 27 additions & 27 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
description = "Parity Ethereum client"
name = "parity"
version = "1.9.6"
version = "1.9.7"
license = "GPL-3.0"
authors = ["Parity Technologies <admin@parity.io>"]
build = "build.rs"
Expand Down
2 changes: 1 addition & 1 deletion ethcore/wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ libc = "0.2"
pwasm-utils = "0.1"
vm = { path = "../vm" }
ethcore-logger = { path = "../../logger" }
wasmi = { version = "0.1", features = ["opt-in-32bit"] }
wasmi = { version = "0.1.3", features = ["opt-in-32bit"] }
2 changes: 1 addition & 1 deletion mac/Parity.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@
<key>OVERWRITE_PERMISSIONS</key>
<false/>
<key>VERSION</key>
<string>1.9.6</string>
<string>1.9.7</string>
</dict>
<key>UUID</key>
<string>2DCD5B81-7BAF-4DA1-9251-6274B089FD36</string>
Expand Down
2 changes: 1 addition & 1 deletion nsis/installer.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
!define DESCRIPTION "Fast, light, robust Ethereum implementation"
!define VERSIONMAJOR 1
!define VERSIONMINOR 9
!define VERSIONBUILD 6
!define VERSIONBUILD 7
!define ARGS ""
!define FIRST_START_ARGS "--mode=passive ui"

Expand Down
2 changes: 1 addition & 1 deletion util/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Ethcore utility library"
homepage = "http://parity.io"
license = "GPL-3.0"
name = "ethcore-util"
version = "1.9.6"
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is no longer necessary.

version = "1.9.7"
authors = ["Parity Technologies <admin@parity.io>"]

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion util/version/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[package]
name = "parity-version"
# NOTE: this value is used for Parity version string.
version = "1.9.6"
version = "1.9.7"
authors = ["Parity Technologies <admin@parity.io>"]
build = "build.rs"

Expand Down