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

Commit 114d443

Browse files
ascjonesdebris
authored andcommitted
Remove windows tray and installer (#8778)
* Remove windows tray and installer * Remove make_exe (installer) target * Change windows $ARC to amd64 for consistency * Fix windows build - revert to winapi 0.2.8 * Remove publishing of windows installer bins
1 parent bd4498c commit 114d443

File tree

11 files changed

+5
-737
lines changed

11 files changed

+5
-737
lines changed

.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ windows:
173173
- stable
174174
- triggers
175175
script:
176-
- sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc installer "" "" windows
176+
- sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc amd64 "" "" windows
177177
tags:
178178
- rust-windows
179179
artifacts:

Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nsis/installer.nsi

-191
This file was deleted.

nsis/logo.ico

-100 KB
Binary file not shown.

scripts/gitlab-build.sh

-18
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ set_env_win () {
4444
set RUST_BACKTRACE=1
4545
#export RUSTFLAGS=$RUSTFLAGS
4646
rustup default stable-x86_64-pc-windows-msvc
47-
echo "MsBuild.exe windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release" > msbuild.cmd
4847
echo "@ signtool sign /f "\%"1 /p "\%"2 /tr http://timestamp.comodoca.com /du https://parity.io "\%"3" > sign.cmd
4948
}
5049
build () {
@@ -166,19 +165,6 @@ make_pkg () {
166165
sign_exe () {
167166
./sign.cmd $keyfile $certpass "target/$PLATFORM/release/parity.exe"
168167
}
169-
make_exe () {
170-
./msbuild.cmd
171-
./sign.cmd $keyfile $certpass windows/ptray/x64/release/ptray.exe
172-
cd nsis
173-
curl -sL --url "https://github.com/paritytech/win-build/raw/master/vc_redist.x64.exe" -o vc_redist.x64.exe
174-
echo "makensis.exe installer.nsi" > nsis.cmd
175-
./nsis.cmd
176-
cd ..
177-
cp nsis/installer.exe "parity_"$VER"_"$IDENT"_"$ARC"."$EXT
178-
./sign.cmd $keyfile $certpass "parity_"$VER"_"$IDENT"_"$ARC"."$EXT
179-
$MD5_BIN "parity_"$VER"_"$IDENT"_"$ARC"."$EXT -p %h > "parity_"$VER"_"$IDENT"_"$ARC"."$EXT".md5"
180-
$SHA256_BIN "parity_"$VER"_"$IDENT"_"$ARC"."$EXT -p %h > "parity_"$VER"_"$IDENT"_"$ARC"."$EXT".sha256"
181-
}
182168
push_binaries () {
183169
echo "Push binaries to AWS S3"
184170
aws configure set aws_access_key_id $s3_key
@@ -205,9 +191,6 @@ push_binaries () {
205191
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/whisper$S3WIN --body target/$PLATFORM/release/whisper$S3WIN
206192
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/whisper$S3WIN.md5 --body whisper$S3WIN.md5
207193
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/whisper$S3WIN.sha256 --body whisper$S3WIN.sha256
208-
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/"parity_"$VER"_"$IDENT"_"$ARC"."$EXT --body "parity_"$VER"_"$IDENT"_"$ARC"."$EXT
209-
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/"parity_"$VER"_"$IDENT"_"$ARC"."$EXT".md5" --body "parity_"$VER"_"$IDENT"_"$ARC"."$EXT".md5"
210-
aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$BUILD_PLATFORM/"parity_"$VER"_"$IDENT"_"$ARC"."$EXT".sha256" --body "parity_"$VER"_"$IDENT"_"$ARC"."$EXT".sha256"
211194
}
212195
make_archive () {
213196
echo "add artifacts to archive"
@@ -356,7 +339,6 @@ case $BUILD_PLATFORM in
356339
build
357340
sign_exe
358341
calculate_checksums
359-
make_exe
360342
make_archive
361343
push_binaries
362344
updater_push_release

0 commit comments

Comments
 (0)