Fix Windows deployment

chrisduerr · Apr 2, 2019 · 338330e · 338330e
1 parent 6f4d1af
commit 338330e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 46 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,46  1,16 @@
 language: rust
 
-services:
-  - docker
-
 git:
   depth: 1
 
 os:
-  - linux
-  - osx
   - windows
 
 rust:
   - stable
-  - beta
-  - nightly
 
 matrix:
   fast_finish: true
-  include:
-    - if: tag IS present
-      os: linux
-      rust: stable
-      env: ARCH=i386
-    - name: "Clippy Linux"
-      os: linux
-      env: CLIPPY=true
-      rust: stable
-    - name: "Clippy OSX"
-      os: osx
-      env: CLIPPY=true
-      rust: stable
-    - name: "Clippy Windows"
-      os: windows
-      env: CLIPPY=true
-      rust: stable
-    - name: "Rustfmt"
-      os: linux
-      env: RUSTFMT=true
-      rust: nightly
-  allow_failures:
-    - rust: nightly
 
 install: ci/install.sh
 script: ci/script.sh
@@ -49,13  19,11 @@ before_deploy: ci/before_deploy.sh
 deploy:
   provider: releases
   api_key:
-    secure: G6JZgC5qKZyxEmuu2eMscDO45iOhBjiCSKuO8gxywqm 4DbMZm7y2OSbQCEmnIFqEgi DLkrH/A7e8LDngQj3lBvRnWkIcszG5ubDm8jsqckXXxjI0cy5q8jJ7s5zZXH2IdXifY59KN9V4iHPwCJlyEE7Aj9JrJLFaVhvaowlSYib9DuDibDX/2u8qZ gP2D/TntiBlFi8SgiDPd7GrZWmNsxJR9edyYbKx9izROp 4q7KAa0Xqak/Zvg72JZnARiKPmBxESEoYYXFcRgRZD9VvjmQ/il6WcHlGSqqn1TRBtIVl8L/1I5/xBJ6KMegP9Jlh7ybm1JPfX108V5d9a9CyqvRYHrhbkHkf5oktizsgw2WyANwiBhEngliMFuUyT0826BEPtkA4TiD7lQXyvO749INdJsqUlMLLuQNpU9/7ShBcRapbGp6AjWH8yxV9ciNMpNexAaxkupYc2NaU6EAC/C34HAtTdfN gyvrtnF1ISrPmmGj8YQRiBUsa4TxghsNPbPHWAgMfR5lFp3dONz0oIydhW/AFgpn 7BVvoIW2z8hXiRttseZHv6akeSjFC5vYObR3UdL/NiuvCjZRiYryL0Be/rI83ug8xELVFBBcv4PxcHEsXWT7EMd3QTiPoCwNKoSoBLk8hPFPAGRXULiSDFENKoJAc4A7zJyMiYY=
     secure: txNDvv4iR5p97lhBDPKz FsmsEAtTvh7sZboHk5aVRUn3VDsoJI0HwSNVJ81Jux2ncQnAYUe6DaiB6MhHxdxb3l7a2lsa7lrxiZ5ov4j39g21Iwsh4frQ4jFaxfo0LTmkSs6DMeliKkI/kKIy4l9yO/dD/4kzZbm7FwT6n1 KqYFELE6C9L/j LARrUObfTGg IhRaWqDs9WDWfc49cIdjqPqCET9X3rviPd27BkY40d tH9mbkXifkPQhlbUVvU8MtZv3vpE9JbScb1EpQYO/pk/D72PXdu4mQnsG90vrK7xP6bJOePUTt4Gpt s6q5RsEnd/805VPVKwFh14 wXr6m2fyKz5/bbuEVQg4we1 IUoCcYTAjcbeNaya9LYO 860U2V851wdJcUz8p95BQfzPtD FcDcZ8hTiymPJUjw7bOdhSkYl8TQdcG0iKT0WFUxMDx9bTBjBILhigp bZia9/1Mtj2Grw5nz9vt WMr2wV69H7cj9f5w2VTTiXnRmap5C7KAHriW2RfExI6bEa6OPzN6l5Ld3XlRJfoZdmOn/zg3P/szKNU3Mnuzj4uLdlt5zyHkpExLYeQXGwp7hDzIyeRX1BzdhYgJ0smzty/I8GVEjk CjWWZoFamFH1IBFNVrYGFxXfH0GBBRg7vNhqR OEee2/xcSh3dh0hoZM=
   skip_cleanup: true
   file_glob: true
   file: "./target/deploy/*"
   on:
     tags: true
     rust: stable
     condition: $CLIPPY != true
-    repo: jwilm/alacritty
-    branch: master
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh
@@ -1,11  1,11 @@
 #!/bin/bash
 
 # All files which should be added only if they changed
-aux_files=("alacritty-completions.bash"
-           "alacritty-completions.fish"
-           "alacritty-completions.zsh"
-           "alacritty.desktop"
-           "alacritty.info"
 aux_files=("extra/completions/alacritty.bash"
            "extra/completions/alacritty.fish"
            "extra/completions/_alacritty"
            "extra/linux/alacritty.desktop"
            "extra/alacritty.info"
            "alacritty.yml")
 
 # Get previous tag to check for changes
@@ -63,17  63,16 @@ elif [ "$TRAVIS_OS_NAME" == "windows" ]; then
 
     # Create msi installer
     ./WiX.*/tools/candle.exe -nologo -arch "x64" -ext WixUIExtension -ext WixUtilExtension -out "target/alacritty.wixobj" "extra/windows/wix/alacritty.wxs"
-    ./WiX.*/tools/light.exe -nologo -ext WixUIExtension -ext WixUtilExtension -out "target/deploy/${name}-windows-installer.msi" -sice:ICE61 -sice:ICE91 "target/alacritty.wixobj"
     ./WiX.*/tools/light.exe -nologo -ext WixUIExtension -ext WixUtilExtension -out "target/installer.msi" -sice:ICE61 -sice:ICE91 "target/alacritty.wixobj"
     mv "target/installer.msi" "target/deploy/${name}-windows-installer.msi"
 fi
 
 # Convert and add manpage if it changed
 if [ -n "$(git diff $prev_tag HEAD alacritty.man)" ]; then
-    gzip -c "./alacritty.man" > "./target/deploy/alacritty.1.gz"
     gzip -c "./extra/alacritty.man" > "./target/deploy/alacritty.1.gz"
 fi
 
-# Offer extra files if they changed
 # Offer various other files
 for file in "${aux_files[@]}"; do
-    if [ -n "$(git diff $prev_tag HEAD $file)" ]; then
-        cp $file "./target/deploy/"
-    fi
     cp $file "./target/deploy/"
 done
diff --git a/extra/windows/wix/alacritty.wxs b/extra/windows/wix/alacritty.wxs
@@ -5,8  5,8 @@
     <Product Name="Alacritty" Id="*" UpgradeCode="87c21c74-dbd5-4584-89d5-46d9cd0c40a7" Language="1033" Codepage="1252" Version="0.2.9" Manufacturer="Alacritty">
         <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
         <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of [ProductName] is already installed."/>
-        <Icon Id="AlacrittyIco" SourceFile="..\alacritty.ico"/>
-        <WixVariable Id="WixUILicenseRtf" Value="license.rtf"/>
         <Icon Id="AlacrittyIco" SourceFile="..\extra\windows\alacritty.ico"/>
         <WixVariable Id="WixUILicenseRtf" Value="..\extra\windows\wix\license.rtf"/>
         <Property Id="ARPPRODUCTICON" Value="AlacrittyIco"/>
         <MediaTemplate EmbedCab="yes"/>
         <UIRef Id="WixUI_Minimal"/>