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

Commit 8e31051

Browse files
authored
stable: snap: release untagged versions from branches to the candidate (#10357) (#10372)
* snap: release untagged versions from branches to the candidate snap channel (#10357) * snap: add the removable-media plug (#10377) This interface allows the snap to access the directories in /media. This is needed when the storage is in a separate disk, not part of home. * exchanged old(azure) bootnodes with new(ovh) ones (#10309) * exchanged old(azure) bootnodes with new(ovh) ones * Fix indent
1 parent 683119f commit 8e31051

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

ethcore/res/ethereum/kovan.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5015,8 +5015,8 @@
50155015
"nodes": [
50165016
"enode://56abaf065581a5985b8c5f4f88bd202526482761ba10be9bfdcd14846dd01f652ec33fde0f8c0fd1db19b59a4c04465681fcef50e11380ca88d25996191c52de@40.71.221.215:30303",
50175017
"enode://d07827483dc47b368eaf88454fb04b41b7452cf454e194e2bd4c14f98a3278fed5d819dbecd0d010407fc7688d941ee1e58d4f9c6354d3da3be92f55c17d7ce3@52.166.117.77:30303",
5018-
"enode://8fa162563a8e5a05eef3e1cd5abc5828c71344f7277bb788a395cce4a0e30baf2b34b92fe0b2dbbba2313ee40236bae2aab3c9811941b9f5a7e8e90aaa27ecba@52.165.239.18:30303",
5019-
"enode://7e2e7f00784f516939f94e22bdc6cf96153603ca2b5df1c7cc0f90a38e7a2f218ffb1c05b156835e8b49086d11fdd1b3e2965be16baa55204167aa9bf536a4d9@52.243.47.56:30303",
5020-
"enode://0518a3d35d4a7b3e8c433e7ffd2355d84a1304ceb5ef349787b556197f0c87fad09daed760635b97d52179d645d3e6d16a37d2cc0a9945c2ddf585684beb39ac@40.68.248.100:30303"
5018+
"enode://38e6e7fd416293ed120d567a2675fe078c0205ab0671abf16982ce969823bd1f3443d590c18b321dfae7dcbe1f6ba98ef8702f255c3c9822a188abb82c53adca@51.77.66.187:30303",
5019+
"enode://6f289111f7c77c68651b0f4803c3a47bcec801f9c618bb41231a1a24a6dbb9c76f2fdb63ba7a21357c41ebb7f6922c17397c1b5c8f71f7d3ef7965505d4945de@144.217.72.209:30303",
5020+
"enode://b6340eb94c3db1362ee517801389fe21cce6354275376b1006f8ce84f8a5cfa2b836268b3727be9db7cd3e581f356f39da39418c4ec1d63d959abc235d99cd86@145.239.7.213:30303"
50215021
]
50225022
}

scripts/gitlab/publish-snap.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,19 @@ set -u # treat unset variables as error
99
TRACK=`awk -F '=' '/^track/ {gsub(/"/, "", $2); gsub(/ /, "", $2); print $2}' ./util/version/Cargo.toml`
1010
echo Track is: $TRACK
1111

12+
# Choose snap release channel based on parity ethereum version track
1213
case ${TRACK} in
1314
nightly) export GRADE="devel" CHANNEL="edge";;
1415
beta) export GRADE="stable" CHANNEL="beta";;
1516
stable) export GRADE="stable" CHANNEL="stable";;
1617
*) echo "No release" && exit 0;;
1718
esac
1819

20+
# Release untagged versions from branches to the candidate snap channel
21+
case ${CI_COMMIT_REF_NAME} in
22+
beta|stable) export GRADE="stable" CHANNEL="candidate";;
23+
esac
24+
1925
VERSION="v"$VERSION
2026
SNAP_PACKAGE="parity_"$VERSION"_"$BUILD_ARCH".snap"
2127

@@ -49,8 +55,5 @@ echo "Release channel :" $CHANNEL " Branch/tag: " $CI_COMMIT_REF_NAME
4955
echo $SNAPCRAFT_LOGIN_PARITY_BASE64 | base64 --decode > snapcraft.login
5056
snapcraft login --with snapcraft.login
5157
snapcraft push --release $CHANNEL $SNAP_PACKAGE
52-
case ${CHANNEL} in
53-
beta) snapcraft push --release candidate $SNAP_PACKAGE;;
54-
esac
5558
snapcraft status parity
5659
snapcraft logout

scripts/snap/snapcraft.template.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ description: |
1414
apps:
1515
parity:
1616
command: parity
17-
plugs: [home, network, network-bind, mount-observe, x11, unity7, desktop, desktop-legacy, wayland]
17+
plugs: [home, network, network-bind, mount-observe, removable-media, x11, unity7, desktop, desktop-legacy, wayland]
1818
desktop: ./usr/share/applications/parity.desktop
1919
parity-evm:
2020
command: parity-evm
21-
plugs: [home, network, network-bind]
21+
plugs: [home, network, network-bind, removable-media]
2222
ethkey:
2323
command: ethkey
24-
plugs: [home]
24+
plugs: [home, removable-media]
2525
ethstore:
2626
command: ethstore
27-
plugs: [home]
27+
plugs: [home, removable-media]
2828
whisper:
2929
command: whisper
30-
plugs: [home, network-bind]
30+
plugs: [home, network-bind, removable-media]
3131

3232
icon: ./scripts/snap/icon.png
3333

0 commit comments

Comments
 (0)