about summary refs log tree commit diff
path: root/src/ci/scripts
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-07-02 08:35:53 +0000
committerbors <bors@rust-lang.org>2020-07-02 08:35:53 +0000
commitb7856f695d65a8ebc846754f97d15814bcb1c244 (patch)
treea30df4257643452b93662f454a9efa4b20e182b7 /src/ci/scripts
parent9491f18c5de3ff1c4bf9c3fdacf52d9859e26f7c (diff)
parentd7be1e4e3353c9f2bc9d697341905e93f57253b1 (diff)
downloadrust-b7856f695d65a8ebc846754f97d15814bcb1c244.tar.gz
rust-b7856f695d65a8ebc846754f97d15814bcb1c244.zip
Auto merge of #73950 - Manishearth:rollup-0dtxnit, r=Manishearth
Rollup of 16 pull requests

Successful merges:

 - #72569 (Remove legacy InnoSetup GUI installer)
 - #73306 (Don't implement Fn* traits for #[target_feature] functions)
 - #73345 (expand: Stop using nonterminals for passing tokens to attribute and derive macros)
 - #73449 (Provide more information on duplicate lang item error.)
 - #73569 (Handle `macro_rules!` tokens consistently across crates)
 - #73803 (Recover extra trailing angle brackets in struct definition)
 - #73839 (Split and expand nonstandard-style lints unicode unit test.)
 - #73841 (Remove defunct `-Z print-region-graph`)
 - #73848 (Fix markdown rendering in librustc_lexer docs)
 - #73865 (Fix Zulip topic format)
 - #73892 (Clean up E0712 explanation)
 - #73898 (remove duplicate test for #61935)
 - #73906 (Add missing backtick in `ty_error_with_message`)
 - #73909 (`#[deny(unsafe_op_in_unsafe_fn)]` in libstd/fs.rs)
 - #73910 (Rewrite a few manual index loops with while-let)
 - #73929 (Fix comment typo)

Failed merges:

r? @ghost
Diffstat (limited to 'src/ci/scripts')
-rwxr-xr-xsrc/ci/scripts/install-innosetup.sh18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/ci/scripts/install-innosetup.sh b/src/ci/scripts/install-innosetup.sh
deleted file mode 100755
index 04ca249777a..00000000000
--- a/src/ci/scripts/install-innosetup.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# We use InnoSetup and its `iscc` program to also create combined installers.
-# Honestly at this point WIX above and `iscc` are just holdovers from
-# oh-so-long-ago and are required for creating installers on Windows. I think
-# one is MSI installers and one is EXE, but they're not used so frequently at
-# this point anyway so perhaps it's a wash!
-
-set -euo pipefail
-IFS=$'\n\t'
-
-source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
-
-if isWindows; then
-    curl.exe -o is-install.exe "${MIRRORS_BASE}/2017-08-22-is.exe"
-    cmd.exe //c "is-install.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-"
-
-    ciCommandAddPath "C:\\Program Files (x86)\\Inno Setup 5"
-fi