From c357051102b2e4c95230de48bef7b404606c7c65 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Mon, 3 Feb 2020 17:18:44 +0300 Subject: [PATCH 01/21] add net core to docs --- images/win/Windows2019-Readme.md | 3 ++- images/win/scripts/Installers/Validate-NET48.ps1 | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 47089227a..28c153426 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -125,7 +125,8 @@ _Environment:_ ## .NET 4.8 -_Version:_ 4.8.03761 +_Version:_ 4.8.03761 +_Path:_ C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools ## Windows Driver Kit diff --git a/images/win/scripts/Installers/Validate-NET48.ps1 b/images/win/scripts/Installers/Validate-NET48.ps1 index d48565bf8..a0b43c1cf 100644 --- a/images/win/scripts/Installers/Validate-NET48.ps1 +++ b/images/win/scripts/Installers/Validate-NET48.ps1 @@ -22,6 +22,7 @@ $SoftwareName = ".NET 4.8" $Description = @" _Version:_ $version +_Path:_ ${Env:ProgramFiles(x86)}\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools "@ Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description From ce62a58d1f35326b24af07a8e75d3c2e74f0de97 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 4 Feb 2020 13:58:37 +0300 Subject: [PATCH 02/21] add path to directory --- .../linux/scripts/installers/google-chrome.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 20396e2a2..71330b935 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -39,11 +39,18 @@ wget "https://chromedriver.storage.googleapis.com/$LATEST_CHROMEDRIVER_VERSION/c unzip chromedriver_linux64.zip rm chromedriver_linux64.zip -CHROMEDRIVER_BIN="/usr/bin/chromedriver" -mv "chromedriver" $CHROMEDRIVER_BIN -chown root:root $CHROMEDRIVER_BIN -chmod +x $CHROMEDRIVER_BIN -echo "CHROMEWEBDRIVER=$CHROMEDRIVER_BIN" | tee -a /etc/environment +CHROME_DRIVER="/usr/local/share/chrome_driver" + +if [ ! -d $CHROME_DRIVER ]; then + mkdir -p $CHROME_DRIVER; +fi + +CHROMEDRIVER_BIN="$CHROME_DRIVER/chromedriver" +mv "chromedriver" $CHROME_DRIVER +chown root:root $CHROME_DRIVER +chmod +x $CHROME_DRIVER +ln -s "$CHROMEDRIVER_BIN" /usr/bin/ +echo "CHROMEWEBDRIVER=$CHROME_DRIVER" | tee -a /etc/environment # Run tests to determine that the chromedriver installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" From bb2a08df6ac68c7b8a997d0f7895f27d4f67a023 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 4 Feb 2020 14:08:26 +0300 Subject: [PATCH 03/21] fix error to pass bin --- images/linux/scripts/installers/google-chrome.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 71330b935..e04799800 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -46,9 +46,9 @@ if [ ! -d $CHROME_DRIVER ]; then fi CHROMEDRIVER_BIN="$CHROME_DRIVER/chromedriver" -mv "chromedriver" $CHROME_DRIVER -chown root:root $CHROME_DRIVER -chmod +x $CHROME_DRIVER +mv "chromedriver" $CHROMEDRIVER_BIN +chown root:root $CHROMEDRIVER_BIN +chmod +x $CHROMEDRIVER_BIN ln -s "$CHROMEDRIVER_BIN" /usr/bin/ echo "CHROMEWEBDRIVER=$CHROME_DRIVER" | tee -a /etc/environment From e88a50287550ea4e6ab901fc0140f89c24e5582c Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 4 Feb 2020 15:39:21 +0300 Subject: [PATCH 04/21] update naming --- images/linux/scripts/installers/google-chrome.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index e04799800..3084629cc 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -39,18 +39,15 @@ wget "https://chromedriver.storage.googleapis.com/$LATEST_CHROMEDRIVER_VERSION/c unzip chromedriver_linux64.zip rm chromedriver_linux64.zip -CHROME_DRIVER="/usr/local/share/chrome_driver" +CHROMEDRIVER_DIR="/usr/local/share/chrome_driver" +CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" -if [ ! -d $CHROME_DRIVER ]; then - mkdir -p $CHROME_DRIVER; -fi - -CHROMEDRIVER_BIN="$CHROME_DRIVER/chromedriver" +mkdir -p $CHROMEDRIVER_DIR mv "chromedriver" $CHROMEDRIVER_BIN chown root:root $CHROMEDRIVER_BIN chmod +x $CHROMEDRIVER_BIN ln -s "$CHROMEDRIVER_BIN" /usr/bin/ -echo "CHROMEWEBDRIVER=$CHROME_DRIVER" | tee -a /etc/environment +echo "CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" | tee -a /etc/environment # Run tests to determine that the chromedriver installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" From f2df3a55d7cf62483c40de27607129433e2ec28a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Tue, 4 Feb 2020 16:03:08 +0300 Subject: [PATCH 05/21] dpkg config --- .../linux/scripts/installers/dpkg-config.sh | 19 +++++++++++++++++++ images/linux/ubuntu1604.json | 4 +++- images/linux/ubuntu1804.json | 3 ++- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 images/linux/scripts/installers/dpkg-config.sh diff --git a/images/linux/scripts/installers/dpkg-config.sh b/images/linux/scripts/installers/dpkg-config.sh new file mode 100644 index 000000000..e92e42700 --- /dev/null +++ b/images/linux/scripts/installers/dpkg-config.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# This is the anti-frontend. It never interacts with you at all, +# and makes the default answers be used for all questions. It +# might mail error messages to root, but that's it; otherwise it +# is completely silent and unobtrusive, a perfect frontend for +# automatic installs. If you are using this front-end, and require +# non-default answers to questions, you will need to preseed the +# debconf database +echo 'DEBIAN_FRONTEND=noninteractive' | tee -a /etc/environment + +# dpkg can be instructed not to ask for confirmation +# when replacing a configuration file (with the --force-confdef --force-confold options) +cat <> /etc/apt/apt.conf.d/10dpkg-options +Dpkg::Options { + "--force-confdef"; + "--force-confold"; +} +EOF \ No newline at end of file diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 73d96e83c..01181fad3 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -161,7 +161,9 @@ "{{template_dir}}/scripts/installers/subversion.sh", "{{template_dir}}/scripts/installers/terraform.sh", "{{template_dir}}/scripts/installers/vcpkg.sh", - "{{template_dir}}/scripts/installers/zeit-now.sh" + "{{template_dir}}/scripts/installers/zeit-now.sh", + "{{template_dir}}/scripts/installers/dpkg-config.sh" + ], "environment_vars": [ "METADATA_FILE={{user `metadata_file`}}", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index dcf2ae543..4eba39c2a 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -164,7 +164,8 @@ "{{template_dir}}/scripts/installers/subversion.sh", "{{template_dir}}/scripts/installers/terraform.sh", "{{template_dir}}/scripts/installers/vcpkg.sh", - "{{template_dir}}/scripts/installers/zeit-now.sh" + "{{template_dir}}/scripts/installers/zeit-now.sh", + "{{template_dir}}/scripts/installers/dpkg-config.sh" ], "environment_vars": [ "METADATA_FILE={{user `metadata_file`}}", From 58033ad1fd42f006525cb72883727546b4ce29ee Mon Sep 17 00:00:00 2001 From: Ivan Nosar Date: Tue, 4 Feb 2020 17:14:16 +0300 Subject: [PATCH 06/21] Install gcc, gfortran and clang on linux --- images/linux/scripts/installers/clang.sh | 84 ++++++++++++++++----- images/linux/scripts/installers/gcc.sh | 39 +++++++--- images/linux/scripts/installers/gfortran.sh | 39 ++++++++++ images/linux/ubuntu1604.json | 1 + images/linux/ubuntu1804.json | 1 + 5 files changed, 133 insertions(+), 31 deletions(-) create mode 100644 images/linux/scripts/installers/gfortran.sh diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index b8e5fa402..d4214981c 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -1,31 +1,77 @@ #!/bin/bash ################################################################################ -## File: example.sh -## Desc: This is an example script that can be copied to add a new software -## installer to the image +## File: clang.sh +## Desc: Installs Clang compiler (versions: 6, 8 and 9) ################################################################################ # Source the helpers for use with the script source $HELPER_SCRIPTS/document.sh source $HELPER_SCRIPTS/apt.sh -wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - -apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-6.0 main" -apt-get update -apt-get install -y clang-6.0 lldb-6.0 lld-6.0 +function InstallClang6_0 { + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - + apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-6.0 main" + apt-get update + apt-get install -y clang-6.0 lldb-6.0 lld-6.0 -update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-6.0 100 -update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 100 + # Run tests to determine that the software installed as expected + echo "Testing to make sure that script performed as expected, and basic scenarios work" + for cmd in clang-6.0 clang++-6.0; do + if ! command -v $cmd; then + echo "$cmd was not installed" + exit 1 + fi + done -# Run tests to determine that the software installed as expected -echo "Testing to make sure that script performed as expected, and basic scenarios work" -for cmd in clang clang++ clang-6.0 clang++-6.0; do - if ! command -v $cmd; then - echo "$cmd was not installed" - exit 1 - fi + # Document what was added to the image + echo "Lastly, documenting what we added to the metadata file" + DocumentInstalledItem "Clang 6.0 ($(clang-6.0 --version | head -n 1 | cut -d ' ' -f 3 | cut -d '-' -f 1))" +} + +function InstallClang { + version=$1 + + echo "Installing clang-$version..." + ./llvm.sh $version + + # Run tests to determine that the software installed as expected + echo "Testing to make sure that script performed as expected, and basic scenarios work" + for cmd in clang-$version clang++-$version; do + if ! command -v $cmd; then + echo "$cmd was not installed" + exit 1 + fi + done + + # Document what was added to the image + echo "Documenting clang-$version..." + DocumentInstalledItem "Clang $version ($(clang-$version --version | head -n 1 | cut -d ' ' -f 3 | cut -d '-' -f 1))" +} + +# Install Clang compiler +apt-get update -y + +# Clang 6.0 is not supported by automatic installation script (`llvm.sh`) +# Thus we have to install it explicitly +InstallClang6_0 + +# Download script for automatic installation +wget https://apt.llvm.org/llvm.sh +chmod +x llvm.sh + +# Install Clang 8 and 9 +versions=( + "8" + "9" +) + +for version in ${versions[*]} +do + InstallClang $version done -# Document what was added to the image -echo "Lastly, documenting what we added to the metadata file" -DocumentInstalledItem "Clang 6.0 ($(clang-6.0 --version | head -n 1 | sed 's/~/\\~/g'))" +rm llvm.sh + +# Make Clang 9 default +update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 100 +update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 100 diff --git a/images/linux/scripts/installers/gcc.sh b/images/linux/scripts/installers/gcc.sh index 328d5c760..2d94d0252 100644 --- a/images/linux/scripts/installers/gcc.sh +++ b/images/linux/scripts/installers/gcc.sh @@ -7,19 +7,34 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/document.sh +function InstallGcc { + version=$1 + + echo "Installing $version..." + apt-get install $version -y + + # Run tests to determine that the software installed as expected + echo "Testing to make sure that script performed as expected, and basic scenarios work" + if ! command -v $version; then + echo "$version was not installed" + exit 1 + fi + + # Document what was added to the image + echo "Documenting $version..." + DocumentInstalledItem "GNU C++ $($version --version | head -n 1 | cut -d ' ' -f 4)" +} + # Install GNU C++ compiler -add-apt-repository ppa:ubuntu-toolchain-r/test -y apt-get update -y -apt-get install g++-7 -y +versions=( + "g++-7" + "g++-8" + "g++-9" +) -# Run tests to determine that the software installed as expected -echo "Testing to make sure that script performed as expected, and basic scenarios work" -if ! command -v g++-7; then - echo "GNU C++ was not installed" - exit 1 -fi - -# Document what was added to the image -echo "Lastly, documenting what we added to the metadata file" -DocumentInstalledItem "GNU C++ $(g++-7 --version | head -n 1 | cut -d ' ' -f 4)" +for version in ${versions[*]} +do + InstallGcc $version +done diff --git a/images/linux/scripts/installers/gfortran.sh b/images/linux/scripts/installers/gfortran.sh new file mode 100644 index 000000000..235f55ea1 --- /dev/null +++ b/images/linux/scripts/installers/gfortran.sh @@ -0,0 +1,39 @@ +#!/bin/bash +################################################################################ +## File: gfortran.sh +## Desc: Installs GNU Fortran +################################################################################ + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/document.sh + +function InstallFortran { + version=$1 + + echo "Installing $version..." + apt-get install $version -y + + # Run tests to determine that the software installed as expected + echo "Testing to make sure that script performed as expected, and basic scenarios work" + if ! command -v $version; then + echo "$version was not installed" + exit 1 + fi + + # Document what was added to the image + echo "Documenting $version..." + DocumentInstalledItem "GNU Fortran $($version --version | head -n 1 | cut -d ' ' -f 5)" +} + +# Install GNU Fortran compiler +apt-get update -y + +versions=( + "gfortran-8" + "gfortran-9" +) + +for version in ${versions[*]} +do + InstallFortran $version +done diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index bca6a3ed0..815fb264c 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -132,6 +132,7 @@ "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/gcc.sh", + "{{template_dir}}/scripts/installers/gfortran.sh", "{{template_dir}}/scripts/installers/git.sh", "{{template_dir}}/scripts/installers/1604/go.sh", "{{template_dir}}/scripts/installers/google-chrome.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 5c57731d8..745922f66 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -135,6 +135,7 @@ "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/gcc.sh", + "{{template_dir}}/scripts/installers/gfortran.sh", "{{template_dir}}/scripts/installers/git.sh", "{{template_dir}}/scripts/installers/1804/go.sh", "{{template_dir}}/scripts/installers/google-chrome.sh", From 4983576a0b8ebabdf3fa240c1c3aafb85cd1a91e Mon Sep 17 00:00:00 2001 From: Ivan Nosar Date: Tue, 4 Feb 2020 18:22:33 +0300 Subject: [PATCH 07/21] Install LLVM on Windows --- images/win/Windows2016-Azure.json | 12 +++++ images/win/Windows2019-Azure.json | 12 +++++ .../win/scripts/Installers/Install-Clang.ps1 | 6 +++ .../win/scripts/Installers/Validate-Clang.ps1 | 46 +++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 images/win/scripts/Installers/Install-Clang.ps1 create mode 100644 images/win/scripts/Installers/Validate-Clang.ps1 diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 375bab0a6..cc15ba495 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -456,6 +456,12 @@ "{{ template_dir }}/scripts/Installers/Install-MinGW.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Clang.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -715,6 +721,12 @@ "{{ template_dir }}/scripts/Installers/Validate-MinGW.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Clang.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index c8acc4b5c..24cae0e11 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -425,6 +425,12 @@ "{{ template_dir }}/scripts/Installers/Install-MinGW.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Install-Clang.ps1" + ] + }, { "type": "powershell", "scripts":[ @@ -684,6 +690,12 @@ "{{ template_dir }}/scripts/Installers/Validate-MinGW.ps1" ] }, + { + "type": "powershell", + "scripts":[ + "{{ template_dir }}/scripts/Installers/Validate-Clang.ps1" + ] + }, { "type": "powershell", "scripts":[ diff --git a/images/win/scripts/Installers/Install-Clang.ps1 b/images/win/scripts/Installers/Install-Clang.ps1 new file mode 100644 index 000000000..bd567a972 --- /dev/null +++ b/images/win/scripts/Installers/Install-Clang.ps1 @@ -0,0 +1,6 @@ +################################################################################ +## File: Install-Clang.ps1 +## Desc: Install Clang compiler as a part of LLVM framework for Windows +################################################################################ + +choco install -y llvm diff --git a/images/win/scripts/Installers/Validate-Clang.ps1 b/images/win/scripts/Installers/Validate-Clang.ps1 new file mode 100644 index 000000000..709943fa6 --- /dev/null +++ b/images/win/scripts/Installers/Validate-Clang.ps1 @@ -0,0 +1,46 @@ +################################################################################ +## File: Validate-Clang.ps1 +## Desc: Validate Clang installation +################################################################################ + +if (Get-Command -Name 'clang') +{ + Write-Host "clang is successfully installed:" + clang --version | Write-Host +} +else +{ + Write-Host "clang is not on PATH" + exit 1 +} + +if (Get-Command -Name 'clang++') +{ + Write-Host "clang++ is successfully installed:" + clang++ --version | Write-Host +} +else +{ + Write-Host "clang++ is not on PATH" + exit 1 +} + +# Adding description of the software to Markdown + +# `clang --version` gives output like: +# clang version 9.0.0 (tags/RELEASE_900/final) +# Target: x86_64-pc-windows-msvc +# Thread model: posix +# InstalledDir: C:\Program Files\LLVM\bin + +$SoftwareName = "Clang" +$(clang --version).Split([System.Environment]::NewLine)[0] -match "\d\.\d\.\d" +$Version = $matches[0] + +$Description = @" +_Version:_ $Version
+_Environment:_ +* PATH: contains location of the LLVM 'bin' directory +"@ + +Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description From 42aa75ce1b0973ec47e5aff1f10d30b43bbce166 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Wed, 5 Feb 2020 12:52:59 +0300 Subject: [PATCH 08/21] Software updates week 6 --- images/macos/macos-10.15-Readme.md | 38 ++++++++++++++++-------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index 2a3e9b49d..83d6c3a21 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,34 +1,34 @@ --- title: GitHub Hosted Github Mojave 10.15 VM Image Updates description: Software used on build machines -date: Week 4 +date: Week 6 --- -#### ⚠️ We are going to change the default Xcode to 11.3.1 next week. -#### Xcode 11.2.1 set by default +#### Xcode 11.3.1 set by default ## Operating System -- OS X 10.15.2 (19C57) **Catalina** +- OS X 10.15.3 (19D76) **Catalina** ## Installed Software ### Language and Runtime - Java 1.7: (Zulu 7.36.0.5-CA-macosx) (build 1.7.0_252-b10) -- Java 1.8: (Zulu 8.44.0.9-CA-macosx) (build 1.8.0_242-b20) (default) +- Java 1.8: (Zulu 8.44.0.11-CA-macosx) (build 1.8.0_242-b20) (default) - Java 11: Zulu11.37+17-CA (build 11.0.6+10-LTS) - Java 12: Zulu12.3+11-CA (build 12.0.2+3) - Java 13: Zulu13.29+9-CA (build 13.0.2+6-MTS) +- Rust 1.41.0 - Node.js v12.14.1 - NVM 0.33.11 -- NVM - Cached node versions: v6.17.1 v8.17.0 v10.18.1 v12.14.1 v13.6.0 -- PowerShell 6.2.3 +- NVM - Cached node versions: v6.17.1 v8.17.0 v10.18.1 v12.14.1 v13.7.0 +- PowerShell 6.2.4 - Python 2.7.17 - Python 3.7.6 - Ruby 2.6.5p114 -- Rust 1.40.0 - .NET SDK 2.0.0 3.0.100 3.0.101 3.0.102 3.1.100 3.1.101 -- Go 1.13.6 +- Go 1.13.7 ### Package Management +- Rustup 1.21.1 - Bundler version 2.1.4 - Carthage 0.34.0 - CocoaPods 1.8.4 @@ -38,34 +38,35 @@ date: Week 4 - NuGet 5.3.1.6268 - Pip 19.3.1 (python 2.7) - Pip 19.3.1 (python 3.7) -- Rustup 1.21.1 - Miniconda 4.7.12 - RubyGems 3.1.2 ### Project Management - Apache Maven 3.6.3 -- Gradle 6.1 +- Gradle 6.1.1 ### Utilities - Curl 7.68.0 - Git: 2.25.0 -- Git LFS: 2.9.2 +- Git LFS: 2.10.0 - GNU Wget 1.20.3 - Subversion (SVN) 1.13.0 -- GNU parallel 20191222 +- GNU parallel 20200122 - OpenSSL 1.0.2t 10 Sep 2019 - jq 1.6 - gpg (GnuPG) 2.2.19 ### Tools -- Fastlane 2.140.0 -- Cmake 3.16.2 +- Fastlane 2.141.0 +- Cmake 3.16.3 - App Center CLI 2.3.3 - Azure CLI 2.0.80 ### Browsers - Google Chrome 79.0.3945.130 - ChromeDriver 79.0.3945.36 +- Microsoft Edge 79.0.309.71 +- MSEdgeDriver 79.0.309.71 ### Toolcache #### Ruby @@ -82,12 +83,12 @@ date: Week 4 - 3.8.1 #### PyPy -- 2.7.13 +- 2.7.17 - 3.6.9 ### Xamarin #### Visual Studio for Mac -- 8.4.1.4 +- 8.4.3.12 #### Mono - 6.6.0.155 @@ -115,7 +116,7 @@ date: Week 4 ### Xcode | Version | Build | Path | | ------------------------------ | ------------------------------ | ------------------------------ | -| 11.3.1 | 11C505 | /Applications/Xcode_11.3.1.app | +| 11.3.1 (default) | 11C505 | /Applications/Xcode_11.3.1.app | | 11.3 | 11C29 | /Applications/Xcode_11.3.app | | 11.2.1 | 11B500 | /Applications/Xcode_11.2.1.app | | 11.2 | 11B52 | /Applications/Xcode_11.2.app | @@ -209,6 +210,7 @@ date: Week 4 | build-tools-29.0.0 | Android SDK Build-Tools, Revision 29.0.0 | | build-tools-29.0.1 | Android SDK Build-Tools, Revision 29.0.1 | | build-tools-29.0.2 | Android SDK Build-Tools, Revision 29.0.2 | +| build-tools-29.0.3 | Android SDK Build-Tools, Revision 29.0.3 | #### Android Utils | Package Name | Version | From 1e889c1a8f76a0d673ad6ebdfa5c07b72e25c570 Mon Sep 17 00:00:00 2001 From: Ivan Nosar Date: Wed, 5 Feb 2020 14:08:16 +0300 Subject: [PATCH 09/21] Fix ubuntu --- images/linux/scripts/installers/gcc.sh | 1 + images/linux/scripts/installers/gfortran.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/images/linux/scripts/installers/gcc.sh b/images/linux/scripts/installers/gcc.sh index 2d94d0252..86575568c 100644 --- a/images/linux/scripts/installers/gcc.sh +++ b/images/linux/scripts/installers/gcc.sh @@ -26,6 +26,7 @@ function InstallGcc { } # Install GNU C++ compiler +add-apt-repository ppa:ubuntu-toolchain-r/test -y apt-get update -y versions=( diff --git a/images/linux/scripts/installers/gfortran.sh b/images/linux/scripts/installers/gfortran.sh index 235f55ea1..1e392839d 100644 --- a/images/linux/scripts/installers/gfortran.sh +++ b/images/linux/scripts/installers/gfortran.sh @@ -26,6 +26,7 @@ function InstallFortran { } # Install GNU Fortran compiler +add-apt-repository ppa:ubuntu-toolchain-r/test -y apt-get update -y versions=( From 378aff19d13ac4ddab43b82e3f2bbf510eab35b6 Mon Sep 17 00:00:00 2001 From: Andrey Mishechkin Date: Wed, 5 Feb 2020 16:32:34 +0400 Subject: [PATCH 10/21] dotnetcore.sh and powershellcore.sh has been moved up --- images/linux/ubuntu1604.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 30f25d9a5..f82606d1f 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -116,6 +116,8 @@ { "type": "shell", "scripts": [ + "{{template_dir}}/scripts/installers/1604/dotnetcore-sdk.sh", + "{{template_dir}}/scripts/installers/1604/powershellcore.sh", "{{template_dir}}/scripts/installers/7-zip.sh", "{{template_dir}}/scripts/installers/ansible.sh", "{{template_dir}}/scripts/installers/azcopy.sh", @@ -129,7 +131,6 @@ "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", "{{template_dir}}/scripts/installers/docker.sh", - "{{template_dir}}/scripts/installers/1604/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/gcc.sh", @@ -154,7 +155,6 @@ "{{template_dir}}/scripts/installers/1604/php.sh", "{{template_dir}}/scripts/installers/pollinate.sh", "{{template_dir}}/scripts/installers/postgresql.sh", - "{{template_dir}}/scripts/installers/1604/powershellcore.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", "{{template_dir}}/scripts/installers/sbt.sh", From 98efcac9a1dfa954f1ec067bda73087034680782 Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Wed, 5 Feb 2020 18:18:51 +0500 Subject: [PATCH 11/21] Add lerna --- images/win/scripts/Installers/Install-NodeLts.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/images/win/scripts/Installers/Install-NodeLts.ps1 b/images/win/scripts/Installers/Install-NodeLts.ps1 index 2490cdfe5..e43febd47 100644 --- a/images/win/scripts/Installers/Install-NodeLts.ps1 +++ b/images/win/scripts/Installers/Install-NodeLts.ps1 @@ -31,3 +31,4 @@ npm install -g gulp-cli npm install -g parcel-bundler npm install -g --save-dev webpack webpack-cli npm install -g yarn +npm install --global lerna \ No newline at end of file From 6d1d8c3e48a5264e315b8c59817081d5d56ac60c Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 5 Feb 2020 16:50:58 +0300 Subject: [PATCH 12/21] remove chown --- images/linux/scripts/installers/google-chrome.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/images/linux/scripts/installers/google-chrome.sh b/images/linux/scripts/installers/google-chrome.sh index 3084629cc..5d19a0f43 100644 --- a/images/linux/scripts/installers/google-chrome.sh +++ b/images/linux/scripts/installers/google-chrome.sh @@ -44,7 +44,6 @@ CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver" mkdir -p $CHROMEDRIVER_DIR mv "chromedriver" $CHROMEDRIVER_BIN -chown root:root $CHROMEDRIVER_BIN chmod +x $CHROMEDRIVER_BIN ln -s "$CHROMEDRIVER_BIN" /usr/bin/ echo "CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" | tee -a /etc/environment From ff62765cc0c563498608528d74691311bea72e42 Mon Sep 17 00:00:00 2001 From: Ivan Nosar Date: Thu, 6 Feb 2020 11:21:06 +0300 Subject: [PATCH 13/21] Resolve comments --- images/linux/scripts/installers/clang.sh | 35 ++++++------------- .../win/scripts/Installers/Validate-Clang.ps1 | 2 +- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index d4214981c..b905b5c06 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -8,31 +8,17 @@ source $HELPER_SCRIPTS/document.sh source $HELPER_SCRIPTS/apt.sh -function InstallClang6_0 { - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - - apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-6.0 main" - apt-get update - apt-get install -y clang-6.0 lldb-6.0 lld-6.0 - - # Run tests to determine that the software installed as expected - echo "Testing to make sure that script performed as expected, and basic scenarios work" - for cmd in clang-6.0 clang++-6.0; do - if ! command -v $cmd; then - echo "$cmd was not installed" - exit 1 - fi - done - - # Document what was added to the image - echo "Lastly, documenting what we added to the metadata file" - DocumentInstalledItem "Clang 6.0 ($(clang-6.0 --version | head -n 1 | cut -d ' ' -f 3 | cut -d '-' -f 1))" -} - function InstallClang { version=$1 echo "Installing clang-$version..." - ./llvm.sh $version + # Clang 6.0 is not supported by automatic installation script (`llvm.sh`) + # Thus we have to install it explicitly + if [[ $version == 6* ]]; then + apt-get install -y "clang-$version" "lldb-$version" "lld-$version" + else + ./llvm.sh $version + fi # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" @@ -49,18 +35,17 @@ function InstallClang { } # Install Clang compiler +wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - +apt-add-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-6.0 main" apt-get update -y -# Clang 6.0 is not supported by automatic installation script (`llvm.sh`) -# Thus we have to install it explicitly -InstallClang6_0 - # Download script for automatic installation wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh # Install Clang 8 and 9 versions=( + "6.0" "8" "9" ) diff --git a/images/win/scripts/Installers/Validate-Clang.ps1 b/images/win/scripts/Installers/Validate-Clang.ps1 index 709943fa6..b785f3d30 100644 --- a/images/win/scripts/Installers/Validate-Clang.ps1 +++ b/images/win/scripts/Installers/Validate-Clang.ps1 @@ -34,7 +34,7 @@ else # InstalledDir: C:\Program Files\LLVM\bin $SoftwareName = "Clang" -$(clang --version).Split([System.Environment]::NewLine)[0] -match "\d\.\d\.\d" +$(clang --version).Split([System.Environment]::NewLine)[0] -match "\d+\.\d+\.\d+" $Version = $matches[0] $Description = @" From 98e26dd773e7fb37e6ef53f13b97eaddd928e612 Mon Sep 17 00:00:00 2001 From: Andrey Mishechkin Date: Thu, 6 Feb 2020 14:16:18 +0400 Subject: [PATCH 14/21] creation of dotnetdev.list repository has been removed --- images/linux/scripts/installers/1604/dotnetcore-sdk.sh | 10 +++++----- images/linux/ubuntu1604.json | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh index e772d924c..9a933376a 100644 --- a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh @@ -34,11 +34,11 @@ for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do echo "Determing if .NET Core ($latest_package) is installed" if ! IsInstalled $latest_package; then echo "Could not find .NET Core ($latest_package), installing..." - curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg - mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg - sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' - apt-get install apt-transport-https - apt-get update + #curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg + #mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg + #sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' + #apt-get install apt-transport-https + #apt-get update apt-get install $latest_package -y else echo ".NET Core ($latest_package) is already installed" diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index f82606d1f..30f25d9a5 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -116,8 +116,6 @@ { "type": "shell", "scripts": [ - "{{template_dir}}/scripts/installers/1604/dotnetcore-sdk.sh", - "{{template_dir}}/scripts/installers/1604/powershellcore.sh", "{{template_dir}}/scripts/installers/7-zip.sh", "{{template_dir}}/scripts/installers/ansible.sh", "{{template_dir}}/scripts/installers/azcopy.sh", @@ -131,6 +129,7 @@ "{{template_dir}}/scripts/installers/docker-compose.sh", "{{template_dir}}/scripts/installers/docker-moby.sh", "{{template_dir}}/scripts/installers/docker.sh", + "{{template_dir}}/scripts/installers/1604/dotnetcore-sdk.sh", "{{template_dir}}/scripts/installers/erlang.sh", "{{template_dir}}/scripts/installers/firefox.sh", "{{template_dir}}/scripts/installers/gcc.sh", @@ -155,6 +154,7 @@ "{{template_dir}}/scripts/installers/1604/php.sh", "{{template_dir}}/scripts/installers/pollinate.sh", "{{template_dir}}/scripts/installers/postgresql.sh", + "{{template_dir}}/scripts/installers/1604/powershellcore.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", "{{template_dir}}/scripts/installers/sbt.sh", From 5bc4c009cd055869d351a300e68433d0b3b87c6f Mon Sep 17 00:00:00 2001 From: Ivan Nosar Date: Thu, 6 Feb 2020 14:33:44 +0300 Subject: [PATCH 15/21] Remove extra comment --- images/linux/scripts/installers/clang.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/images/linux/scripts/installers/clang.sh b/images/linux/scripts/installers/clang.sh index b905b5c06..0a7f2252f 100644 --- a/images/linux/scripts/installers/clang.sh +++ b/images/linux/scripts/installers/clang.sh @@ -43,7 +43,6 @@ apt-get update -y wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh -# Install Clang 8 and 9 versions=( "6.0" "8" From 2c0ff371474c4e6143fc00851d986c1333debe99 Mon Sep 17 00:00:00 2001 From: Andrey Mishechkin Date: Thu, 6 Feb 2020 23:14:36 +0400 Subject: [PATCH 16/21] Commented creation of dotnetdev.list repository has been removed --- images/linux/scripts/installers/1604/dotnetcore-sdk.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh index 9a933376a..9baa83e9b 100644 --- a/images/linux/scripts/installers/1604/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/1604/dotnetcore-sdk.sh @@ -34,11 +34,6 @@ for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do echo "Determing if .NET Core ($latest_package) is installed" if ! IsInstalled $latest_package; then echo "Could not find .NET Core ($latest_package), installing..." - #curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg - #mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg - #sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod bionic main" > /etc/apt/sources.list.d/dotnetdev.list' - #apt-get install apt-transport-https - #apt-get update apt-get install $latest_package -y else echo ".NET Core ($latest_package) is already installed" From 2463728a1e94bc080b5007e2d40664dad7f9b31a Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Fri, 7 Feb 2020 10:50:20 +0300 Subject: [PATCH 17/21] disable telemetry --- images/linux/scripts/installers/1804/dotnetcore-sdk.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh index e772d924c..3b80d2cb4 100644 --- a/images/linux/scripts/installers/1804/dotnetcore-sdk.sh +++ b/images/linux/scripts/installers/1804/dotnetcore-sdk.sh @@ -30,6 +30,9 @@ mksamples() set -e +# Disable telemetry +export DOTNET_CLI_TELEMETRY_OPTOUT=1 + for latest_package in ${LATEST_DOTNET_PACKAGES[@]}; do echo "Determing if .NET Core ($latest_package) is installed" if ! IsInstalled $latest_package; then From 6fb22bcf938e515b24024004ffef79ba0c304e34 Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Wed, 5 Feb 2020 18:22:51 +0500 Subject: [PATCH 18/21] Add lerna validation --- images/win/scripts/Installers/Validate-NodeLts.ps1 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/images/win/scripts/Installers/Validate-NodeLts.ps1 b/images/win/scripts/Installers/Validate-NodeLts.ps1 index f2c86faf8..7d42a0408 100644 --- a/images/win/scripts/Installers/Validate-NodeLts.ps1 +++ b/images/win/scripts/Installers/Validate-NodeLts.ps1 @@ -26,6 +26,16 @@ else exit 1 } +if(Get-Command -Name 'lerna') +{ + Write-Host "lerna $(lerna --version) on path" +} +else +{ + Write-Host "lerna is not on path" + exit 1 +} + if( $(node --version) -match 'v(?.*)' ) From f26dcc9a9152fa7499f09f18081cffbb549d5d35 Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Fri, 7 Feb 2020 17:01:56 +0500 Subject: [PATCH 19/21] set -g instead of --global to be consistent with previous lines --- images/win/scripts/Installers/Install-NodeLts.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-NodeLts.ps1 b/images/win/scripts/Installers/Install-NodeLts.ps1 index e43febd47..e98e7f393 100644 --- a/images/win/scripts/Installers/Install-NodeLts.ps1 +++ b/images/win/scripts/Installers/Install-NodeLts.ps1 @@ -31,4 +31,4 @@ npm install -g gulp-cli npm install -g parcel-bundler npm install -g --save-dev webpack webpack-cli npm install -g yarn -npm install --global lerna \ No newline at end of file +npm install -g lerna From 7a9bee9192cafafecaf4da040fef1aa859160067 Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Fri, 7 Feb 2020 15:17:43 +0300 Subject: [PATCH 20/21] Remove references to git.io --- images/linux/scripts/installers/1604/kubernetes-tools.sh | 2 +- images/linux/scripts/installers/1804/kubernetes-tools.sh | 2 +- images/linux/scripts/installers/nodejs.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/1604/kubernetes-tools.sh b/images/linux/scripts/installers/1604/kubernetes-tools.sh index 934fe92cd..448ecd05b 100644 --- a/images/linux/scripts/installers/1604/kubernetes-tools.sh +++ b/images/linux/scripts/installers/1604/kubernetes-tools.sh @@ -17,7 +17,7 @@ apt-get update apt-get install -y kubectl # Install Helm -curl -L https://git.io/get_helm.sh | bash +curl -L https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" diff --git a/images/linux/scripts/installers/1804/kubernetes-tools.sh b/images/linux/scripts/installers/1804/kubernetes-tools.sh index b0a6f43f6..ba6f0aa03 100644 --- a/images/linux/scripts/installers/1804/kubernetes-tools.sh +++ b/images/linux/scripts/installers/1804/kubernetes-tools.sh @@ -19,7 +19,7 @@ apt-get update apt-get install -y kubectl # Install Helm -curl -L https://git.io/get_helm.sh | bash +curl -L https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" diff --git a/images/linux/scripts/installers/nodejs.sh b/images/linux/scripts/installers/nodejs.sh index c4d6296ef..5b4777a6f 100644 --- a/images/linux/scripts/installers/nodejs.sh +++ b/images/linux/scripts/installers/nodejs.sh @@ -8,7 +8,7 @@ source $HELPER_SCRIPTS/document.sh # Install LTS Node.js and related build tools -curl -sL https://git.io/n-install | bash -s -- -ny - +curl -sL https://raw.githubusercontent.com/mklement0/n-install/stable/bin/n-install | bash -s -- -ny - ~/n/bin/n lts npm install -g grunt gulp n parcel-bundler typescript npm install -g --save-dev webpack webpack-cli From 9c06dae2e32a6f9fefa528aa5b764237ca293626 Mon Sep 17 00:00:00 2001 From: Ivan Nosar Date: Mon, 10 Feb 2020 13:58:06 +0300 Subject: [PATCH 21/21] Remove Clang --- images/win/Windows2016-Azure.json | 12 ----- images/win/Windows2019-Azure.json | 12 ----- .../win/scripts/Installers/Install-Clang.ps1 | 6 --- .../win/scripts/Installers/Validate-Clang.ps1 | 46 ------------------- 4 files changed, 76 deletions(-) delete mode 100644 images/win/scripts/Installers/Install-Clang.ps1 delete mode 100644 images/win/scripts/Installers/Validate-Clang.ps1 diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 1530e4866..98d96feb9 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -462,12 +462,6 @@ "{{ template_dir }}/scripts/Installers/Install-MinGW.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-Clang.ps1" - ] - }, { "type": "powershell", "scripts":[ @@ -733,12 +727,6 @@ "{{ template_dir }}/scripts/Installers/Validate-MinGW.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Validate-Clang.ps1" - ] - }, { "type": "powershell", "scripts":[ diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index 657f76b77..46792679b 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -437,12 +437,6 @@ "{{ template_dir }}/scripts/Installers/Install-MinGW.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Install-Clang.ps1" - ] - }, { "type": "powershell", "scripts":[ @@ -708,12 +702,6 @@ "{{ template_dir }}/scripts/Installers/Validate-MinGW.ps1" ] }, - { - "type": "powershell", - "scripts":[ - "{{ template_dir }}/scripts/Installers/Validate-Clang.ps1" - ] - }, { "type": "powershell", "scripts":[ diff --git a/images/win/scripts/Installers/Install-Clang.ps1 b/images/win/scripts/Installers/Install-Clang.ps1 deleted file mode 100644 index bd567a972..000000000 --- a/images/win/scripts/Installers/Install-Clang.ps1 +++ /dev/null @@ -1,6 +0,0 @@ -################################################################################ -## File: Install-Clang.ps1 -## Desc: Install Clang compiler as a part of LLVM framework for Windows -################################################################################ - -choco install -y llvm diff --git a/images/win/scripts/Installers/Validate-Clang.ps1 b/images/win/scripts/Installers/Validate-Clang.ps1 deleted file mode 100644 index b785f3d30..000000000 --- a/images/win/scripts/Installers/Validate-Clang.ps1 +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -## File: Validate-Clang.ps1 -## Desc: Validate Clang installation -################################################################################ - -if (Get-Command -Name 'clang') -{ - Write-Host "clang is successfully installed:" - clang --version | Write-Host -} -else -{ - Write-Host "clang is not on PATH" - exit 1 -} - -if (Get-Command -Name 'clang++') -{ - Write-Host "clang++ is successfully installed:" - clang++ --version | Write-Host -} -else -{ - Write-Host "clang++ is not on PATH" - exit 1 -} - -# Adding description of the software to Markdown - -# `clang --version` gives output like: -# clang version 9.0.0 (tags/RELEASE_900/final) -# Target: x86_64-pc-windows-msvc -# Thread model: posix -# InstalledDir: C:\Program Files\LLVM\bin - -$SoftwareName = "Clang" -$(clang --version).Split([System.Environment]::NewLine)[0] -match "\d+\.\d+\.\d+" -$Version = $matches[0] - -$Description = @" -_Version:_ $Version
-_Environment:_ -* PATH: contains location of the LLVM 'bin' directory -"@ - -Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description