Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge Merge pull request #468 from TheBigBear/TheBigBear-fix-travis-ci-bad-URLs back to Travis-ci_cron-daily branch #545

Merged
merged 15 commits into from
Jul 11, 2016
Merged

merge Merge pull request #468 from TheBigBear/TheBigBear-fix-travis-ci-bad-URLs back to Travis-ci_cron-daily branch #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
685ad11
Merge pull request #467 from saltstack/travis-ci_cron_daily
TheBigBear Jul 11, 2016
5215e89
Delete cdex.sls
TheBigBear Jul 11, 2016
5048f19
Update gimp.sls
TheBigBear Jul 11, 2016
b74bd3b
Update ice.sls
TheBigBear Jul 11, 2016
2847865
Update cyberduck-cli.sls
TheBigBear Jul 11, 2016
8a11af5
Update miktex-basic.sls
TheBigBear Jul 11, 2016
eecd388
Update nxlog.sls
TheBigBear Jul 11, 2016
a3a8c15
Update skype-msi.sls
TheBigBear Jul 11, 2016
5dcdbf8
Update wamp-server-3.sls
TheBigBear Jul 11, 2016
689ce96
Update winscp.sls
TheBigBear Jul 11, 2016
fda3408
Delete wireshark-devel.sls
TheBigBear Jul 11, 2016
e4a46f2
Merge pull request #468 from TheBigBear/TheBigBear-fix-travis-ci-bad-…
TheBigBear Jul 11, 2016
f46254c
Merge pull request #544 from TheBigBear/master
TheBigBear Jul 11, 2016
f7bc9b6
Merge pull request #469 from saltstack/master
TheBigBear Jul 11, 2016
9b425d7
Merge pull request #470 from TheBigBear/master
TheBigBear Jul 11, 2016
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
16 changes: 0 additions & 16 deletions cdex.sls
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions cyberduck-cli.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
cyberduck-cli:
'1.0.0.0':
full_name: 'Cyberduck CLI'
installer: 'http://dist.duck.sh/duck-4.8.0.18560.exe'
installer: 'http://dist.duck.sh/duck-5.0.3.20504.exe'
install_flags: '/quiet /norestart'
uninstaller: '%ALLUSERSPROFILE%\Package Cache\{546f46a5-c136-46d7-9698-8bd02eea4402}\duck-4.8.0.18560.exe'
uninstaller: '%ALLUSERSPROFILE%\Package Cache\{d7e97b39-df55-4b65-84b3-c24d1041948b}\duck-5.0.3.20504.exe'
uninstall_flags: '/uninstall /quiet /norestart'
msiexec: False
locale: en_US
Expand Down
2 changes: 1 addition & 1 deletion gimp.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# just 32-bit x86 installer available
# Gimp installs into %ProgramFiles anyway
gimp:
{% for version, dl_version in (('2.8.14','-1'), ('2.8.10', ''), ('2.8.8', ''), ('2.8.4', ''), ('2.8.2', '-1'), ('2.8.0','')) %}
{% for version, dl_version in (('2.8.14','-1')) %}
{{ version }}:
full_name: 'GIMP {{ version }}'
installer: 'http://download.gimp.org/mirror/pub/gimp/v2.8/windows/gimp-{{ version }}-setup{{ dl_version }}.exe'
Expand Down
18 changes: 0 additions & 18 deletions ice.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,3 @@ ice:
msiexec: True
locale: en_US
reboot: False
'3.6.0':
full_name: 'Ice 3.6.0'
installer: 'https://zeroc.com/download/Ice/3.6/Ice-3.6.0.msi'
uninstaller: '{5F9FE03C-9696-406D-B747-76598903B018}'
install_flags: '/qn /norestart'
uninstall_flags: '/qn /norestart'
msiexec: True
locale: en_US
reboot: False
'3.4.0':
full_name: 'Ice 3.4.0'
installer: 'https://zeroc.com/download/Ice/3.4/Ice-3.4.0.msi'
uninstaller: '{C69C5CD7-2C53-4223-A228-EF40DCF90AE7}'
install_flags: '/qn /norestart'
uninstall_flags: '/qn /norestart'
msiexec: True
locale: en_US
reboot: False
4 changes: 2 additions & 2 deletions miktex-basic.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ miktex-basic:
'2.9':
full_name: 'MiKTeX 2.9'
{% if grains['cpuarch'] == 'AMD64' %}
installer: 'http://mirrors.ctan.org/systems/win32/miktex/setup/basic-miktex-2.9.5997-x64.exe'
installer: 'http://mirrors.ctan.org/systems/win32/miktex/setup/basic-miktex-2.9.6022-x64.exe'
{% elif grains['cpuarch'] == 'x86' %}
installer: 'http://mirrors.ctan.org/systems/win32/miktex/setup/basic-miktex-2.9.5997.exe'
installer: 'http://mirrors.ctan.org/systems/win32/miktex/setup/basic-miktex-2.9.6022.exe'
{% endif %}
install_flags: '--auto-install=yes --paper-size=A4 --shared --unattended --package-set=basic --program-folder="%ProgramFiles%\MiKTeX 2.9\"'
uninstaller: 'cmd'
Expand Down
6 changes: 3 additions & 3 deletions nxlog.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
nxlog:
'2.9.1504':
'2.9.1716':
full_name: 'NXLog-CE'
installer: 'http://nxlog.org/system/files/products/files/1/nxlog-ce-2.9.1504.msi'
installer: 'http://nxlog.org/system/files/products/files/1/nxlog-ce-2.9.1716.msi'
install_flags: '/quiet /norestart'
uninstaller: 'http://nxlog.org/system/files/products/files/1/nxlog-ce-2.9.1504.msi'
uninstaller: 'http://nxlog.org/system/files/products/files/1/nxlog-ce-2.9.1716.msi'
uninstall_flags: '/quiet /norestart'
msiexec: True
locale: en_US
Expand Down
70 changes: 8 additions & 62 deletions skype-msi.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,72 +1,18 @@
skype-msi:
'7.23.105':
full_name: 'Skype™ 7.23'
installer: 'http://download.skype.com/msi/SkypeSetup_7.23.0.105.msi'
install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.23.0.105.msi'
uninstall_flags: '/qn /norestart'
msiexec: True
locale: en_US
reboot: False
'7.18.112':
full_name: 'Skype™ 7.18'
installer: 'http://download.skype.com/msi/SkypeSetup_7.18.0.112.msi'
install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.18.0.112.msi'
uninstall_flags: '/qn /norestart'
msiexec: True
locale: en_US
reboot: False
'7.18.111':
full_name: 'Skype™ 7.18'
installer: 'http://download.skype.com/msi/SkypeSetup_7.18.0.111.msi'
install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.18.0.111.msi'
uninstall_flags: '/qn /norestart'
msiexec: True
locale: en_US
reboot: False
'7.18.103':
full_name: 'Skype™ 7.18'
installer: 'http://download.skype.com/msi/SkypeSetup_7.18.0.103.msi'
'7.25.106':
full_name: 'Skype™ 7.25'
installer: 'http://download.skype.com/msi/SkypeSetup_7.25.0.106.msi'
install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.18.0.103.msi'
uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.25.0.106.msi'
uninstall_flags: '/qn /norestart'
msiexec: True
locale: en_US
reboot: False
'7.17.106':
full_name: 'Skype™ 7.17'
installer: 'http://download.skype.com/msi/SkypeSetup_7.17.0.106.msi'
install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.17.0.106.msi'
uninstall_flags: '/qn /norestart'
msiexec: True
locale: en_US
reboot: False
'7.8.102':
full_name: 'Skype™ 7.8'
installer: 'http://download.skype.com/msi/SkypeSetup_7.8.0.102.msi'
install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.8.0.102.msi'
uninstall_flags: '/qn /norestart'
msiexec: True
locale: en_US
reboot: False
'7.7.102':
full_name: 'Skype™ 7.7'
installer: 'http://download.skype.com/msi/SkypeSetup_7.7.0.102.msi'
install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.7.0.102.msi'
uninstall_flags: '/qn /norestart'
msiexec: True
locale: en_US
reboot: False
'7.1.0.105':
full_name: 'Skype™ 7.1'
installer: 'http://download.skype.com/msi/SkypeSetup_7.1.0.105.msi'
'7.23.105':
full_name: 'Skype™ 7.23'
installer: 'http://download.skype.com/msi/SkypeSetup_7.23.0.105.msi'
install_flags: '/qn /norestart STARTSKYPE=FALSE TRANSFORMS=:RemoveDesktopShortcut.mst TRANSFORMS=:RemoveStartup.mst'
uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.1.0.105.msi'
uninstaller: 'http://download.skype.com/msi/SkypeSetup_7.23.0.105.msi'
uninstall_flags: '/qn /norestart'
msiexec: True
locale: en_US
Expand Down
10 changes: 5 additions & 5 deletions wamp-server-3.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
wamp-server-3:
'3.0.0':
'3.0.4':
{% if grains['cpuarch'] == 'AMD64' %}
full_name: 'Wampserver64 3.0.0'
installer: 'http://skylink.dl.sourceforge.net/project/wampserver/WampServer%203/WampServer%203.0.0/wampserver3_x64_apache2.4.17_mysql5.7.9_php5.6.16_php7.0.0.exe'
full_name: 'Wampserver64 3.0.4'
installer: 'http://tenet.dl.sourceforge.net/project/wampserver/WampServer%203/WampServer%203.0.0/wampserver3_x64_apache2.4.18_mysql5.7.11_php5.6.19-7.0.4.exe'
uninstaller: 'c:\wamp64\uninstall_services.bat'
uninstall_flags: '& c:\wamp64\unins000.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-'
{% elif grains['cpuarch'] == 'x86' %}
full_name: 'Wampserver 3.0.0'
installer: 'http://heanet.dl.sourceforge.net/project/wampserver/WampServer%203/WampServer%203.0.0/wampserver3_x86_apache2.4.17_mysql5.7.9_php5.6.15.exe'
full_name: 'Wampserver 3.0.4'
installer: 'http://tenet.dl.sourceforge.net/project/wampserver/WampServer%203/WampServer%203.0.0/wampserver3.0.4_x86_apache2.4.18_mysql5.7.11_php5.6.19-7.0.4.exe'
uninstaller: 'c:\wamp\uninstall_services.bat'
uninstall_flags: '& c:\wamp\unins000.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-'
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion winscp.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% set PROGRAM_FILES = "%ProgramFiles%" %}
{% endif %}
winscp:
{% for version, file_version in (('5.7.6', '576'), ('5.7.5', '575'), ('5.7.4', '574')) %}
{% for version, file_version in (('5.7.7', '577'), ('5.7.6', '576'), ('5.7.5', '575'), ('5.7.4', '574')) %}
'{{ version }}':
full_name: 'WinSCP {{ version }}'
installer: 'http://heanet.dl.sourceforge.net/project/winscp/WinSCP/{{ version }}/winscp{{ file_version }}setup.exe'
Expand Down
17 changes: 0 additions & 17 deletions wireshark-devel.sls
View file
Open in desktop

This file was deleted.