From a400c7065e7f02f7112d1e8b7a35819e24658c5d Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 26 Aug 2020 16:23:13 +0000 Subject: [PATCH 01/14] Updating readme file for ubuntu20 version 20200825.1 --- images/linux/Ubuntu2004-README.md | 45 ++++++++++++++++--------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index ed26985a..fb074ef3 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,12 +1,12 @@ # Ubuntu 20.04.1 LTS -The following software is installed on machines with the 20200817.1 update. +The following software is installed on machines with the 20200825.1 update. *** - 7-Zip 16.02 - Ansible (ansible 2.9.6) - AzCopy7 (available by azcopy alias) 7.3.0 -- AzCopy10 (available by azcopy10 alias) 10.5.1 -- Azure CLI (azure-cli 2.10.1) +- AzCopy10 (available by azcopy10 alias) 10.6.0 +- Azure CLI (azure-cli 2.10.1 *) - Azure CLI (azure-devops 0.18.0) - Basic packages: - dnsutils @@ -65,7 +65,7 @@ The following software is installed on machines with the 20200817.1 update. - yamllint - libcurl4 - Alibaba Cloud CLI (3.0.56) -- AWS CLI (aws-cli/2.0.40 Python/3.7.3 Linux/5.4.0-1022-azure exe/x86_64.ubuntu.20) +- AWS CLI (aws-cli/2.0.42 Python/3.7.3 Linux/5.4.0-1022-azure exe/x86_64.ubuntu.20) - AWS CLI Session manager plugin (1.1.61.0) - build-essential - Clang 6.0 (6.0.1) @@ -79,7 +79,7 @@ Target: x86_64-unknown-linux-gnu - Skopeo (1.1.1) - Docker Compose (docker-compose version 1.26.2, build eefe0d31) - Docker-Moby (Docker version 19.03.12+azure, build 0ed913b885c8919944a2e4c8d0b80a318a8dd48b) -- Docker-Buildx (0.4.1+azure) +- Docker-Buildx (0.4.2+azure) - .NET Core SDK: - 3.1.401 - 3.1.302 @@ -156,26 +156,27 @@ Target: x86_64-unknown-linux-gnu - Git-ftp (1.6.0) - Hub CLI (2.14.2) - GitHub CLI 0.11.1 -- Google Chrome (Google Chrome 84.0.4147.125 ) -- ChromeDriver 84.0.4147.30 (48b3e868b4cc0aa7e8149519690b6f6949e110a8-refs/branch-heads/4147@{#310}); Chrome Driver is available via CHROMEWEBDRIVER environment variable -- Google Cloud SDK (305.0.0) +- Google Chrome (Google Chrome 85.0.4183.83 ) +- ChromeDriver 85.0.4183.38 (9047dbc2c693f044042bbec5c91401c708c7c26a-refs/branch-heads/4183@{#779}); Chrome Driver is available via CHROMEWEBDRIVER environment variable +- Google Cloud SDK (307.0.0) - Haskell Cabal (cabal-install version 3.2.0.0 compiled using version 3.2.0.0 of the Cabal library ) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.10.2) - Haskell Stack (Version 2.3.3, Git revision cb44d51bed48b723a5deb08c3348c0b3ccfc437e x86_64 hpack-0.33.0) -- Heroku (heroku/7.42.6 linux-x64 node-v12.16.2) -- HHVM (HipHop VM 4.69.1 (rel)) +- Heroku (heroku/7.42.10 linux-x64 node-v12.16.2) +- HHVM (HipHop VM 4.71.0 (rel)) - ImageMagick - Adopt OpenJDK: - 8 (openjdk version "1.8.0_265") - 11 (openjdk version "11.0.8" 2020-07-14) (default) - Ant (Apache Ant(TM) version 1.10.7 compiled on October 24 2019) -- Gradle 6.6 +- Gradle 6.6.1 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) - Kind (kind v0.8.1 go1.14.2 linux/amd64) - kubectl (Client Version: v1.18.8) - helm (v3.3.0+g8a4aeec) - minikube version: v1.12.3 +- kustomize ({kustomize/v3.8.1 2020-07-16T00:58:46Z }) - oc CLI Client Version: 4.5.0-202005291417-9933eb9 - Leiningen (Leiningen 2.9.4 on Java 11.0.8 OpenJDK 64-Bit Server VM) - Mercurial (Mercurial Distributed SCM (version 5.3.1)) @@ -192,13 +193,13 @@ compiled using version 3.2.0.0 of the Cabal library ) Local version: Unknown) - n (6.7.0) - Parcel (1.12.4) -- TypeScript (Version 3.9.7) +- TypeScript (Version 4.0.2) - Webpack (4.44.1) - Webpack CLI (3.3.12) - Yarn (1.22.4) - Newman (5.1.2) - Bazel (bazel 3.4.1) -- Bazelisk (1.6.0) +- Bazelisk (1.6.1) - ORAS CLI 0.8.1 - PhantomJS (2.1.1) - PHP 7.4 (PHP 7.4.9 (cli) (built: Aug 7 2020 14:30:01) ( NTS )) @@ -223,8 +224,8 @@ apt-get update - rustfmt (1.4.17-stable) - clippy (0.0.212) - rustdoc (1.45.2) -- bindgen (0.54.1) -- cbindgen (0.14.3) +- bindgen (0.55.1) +- cbindgen (0.14.4) - cargo audit (0.12.0) - cargo outdated (v0.9.11) - Julia (julia version 1.5.0) @@ -236,7 +237,7 @@ apt-get update - Terraform (Terraform v0.13.0) - Packer (1.6.1) - Vcpkg 2020.06.15-unknownhash -- Vercel CLI (19.2.0) +- Vercel CLI (20.0.0) - MongoDB on Linux v4.4.0 - Haveged 1.9.1-6ubuntu1 - Swig 4.0.1 @@ -244,13 +245,13 @@ apt-get update - Google Repository 58 - Google Play services 49 - CMake 3.10.2.4988404 -- Android Support Repository 47.0.0 - Android SDK Platform-Tools 30.0.4 - Android SDK Platform 30 - Android SDK Platform 29 - Android SDK Platform 28 - Android SDK Platform 27 - Android SDK Patch Applier v4 +- Android SDK Build-Tools 30.0.2 - Android SDK Build-Tools 30.0.1 - Android SDK Build-Tools 30.0.0 - Android SDK Build-Tools 29.0.3 @@ -265,7 +266,7 @@ apt-get update - Android SDK Build-Tools 27.0.1 - Android SDK Build-Tools 27.0.0 - Android NDK 21.3.6528147 -- Az Module (4.5.0) +- Az Module (4.6.0) - Cached container images - node:10 (Digest: sha256:cf3ee6a5a1b1916c7a2e4fb51eb7ecba1afe186739677d62e9c1bb2cb1c7d6b0) - node:12 (Digest: sha256:d0738468dfc7cedb7d260369e0546fd7ee8731cfd67136f6023d070ad9679090) @@ -293,8 +294,8 @@ apt-get update - Python: - Python 2.7.18 - Python 3.5.9 - - Python 3.6.11 - - Python 3.7.8 + - Python 3.6.12 + - Python 3.7.9 - Python 3.8.5 - PyPy: - PyPy 2.7.13 [PyPy 7.3.1 with GCC 7.3.1 20180303 (Red Hat 7.3.1-5)] @@ -308,5 +309,5 @@ apt-get update - go 1.14.7 - go 1.15.0 - AWS SAM CLI, version 1.1.0 -- Homebrew on Linux (Homebrew 2.4.11 -Homebrew/linuxbrew-core (git revision 99cdab; last commit 2020-08-16)) +- Homebrew on Linux (Homebrew 2.4.13 +Homebrew/linuxbrew-core (git revision 7d5ec; last commit 2020-08-24)) From 4083238f8de0426edfa7628e4ad2145a4f11b33e Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 26 Aug 2020 16:32:06 +0000 Subject: [PATCH 02/14] Updating readme file for ubuntu18 version 20200825.1 --- images/linux/Ubuntu1804-README.md | 43 ++++++++++++++++--------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index 5f913d63..03ef0072 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,12 +1,12 @@ # Ubuntu 18.04.5 LTS -The following software is installed on machines with the 20200817.1 update. +The following software is installed on machines with the 20200825.1 update. *** - 7-Zip 16.02 - Ansible (ansible 2.9.12) - AzCopy7 (available by azcopy alias) 7.3.0 -- AzCopy10 (available by azcopy10 alias) 10.5.1 -- Azure CLI (azure-cli 2.10.1) +- AzCopy10 (available by azcopy10 alias) 10.6.0 +- Azure CLI (azure-cli 2.10.1 *) - Azure CLI (azure-devops 0.18.0) - Basic packages: - dnsutils @@ -65,7 +65,7 @@ The following software is installed on machines with the 20200817.1 update. - yamllint - libcurl3 - Alibaba Cloud CLI (3.0.56) -- AWS CLI (aws-cli/1.18.120 Python/2.7.17 Linux/5.3.0-1034-azure botocore/1.17.43) +- AWS CLI (aws-cli/1.18.125 Python/2.7.17 Linux/5.3.0-1035-azure botocore/1.17.48) - AWS CLI Session manager plugin (1.1.61.0) - build-essential - Clang 6.0 (6.0.0) @@ -79,7 +79,7 @@ Target: x86_64-unknown-linux-gnu - Skopeo (1.1.1) - Docker Compose (docker-compose version 1.26.2, build eefe0d31) - Docker-Moby (Docker version 19.03.12+azure, build 0ed913b885c8919944a2e4c8d0b80a318a8dd48b) -- Docker-Buildx (0.4.1+azure) +- Docker-Buildx (0.4.2+azure) - .NET Core SDK: - 3.1.401 - 3.1.302 @@ -160,15 +160,15 @@ Target: x86_64-unknown-linux-gnu - Git-ftp (1.3.1) - Hub CLI (2.14.2) - GitHub CLI 0.11.1 -- Google Chrome (Google Chrome 84.0.4147.125 ) -- ChromeDriver 84.0.4147.30 (48b3e868b4cc0aa7e8149519690b6f6949e110a8-refs/branch-heads/4147@{#310}); Chrome Driver is available via CHROMEWEBDRIVER environment variable -- Google Cloud SDK (305.0.0) +- Google Chrome (Google Chrome 85.0.4183.83 ) +- ChromeDriver 85.0.4183.38 (9047dbc2c693f044042bbec5c91401c708c7c26a-refs/branch-heads/4183@{#779}); Chrome Driver is available via CHROMEWEBDRIVER environment variable +- Google Cloud SDK (307.0.0) - Haskell Cabal (cabal-install version 3.2.0.0 compiled using version 3.2.0.0 of the Cabal library ) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.10.2) - Haskell Stack (Version 2.3.3, Git revision cb44d51bed48b723a5deb08c3348c0b3ccfc437e x86_64 hpack-0.33.0) -- Heroku (heroku/7.42.6 linux-x64 node-v12.16.2) -- HHVM (HipHop VM 4.69.1 (rel)) +- Heroku (heroku/7.42.10 linux-x64 node-v12.16.2) +- HHVM (HipHop VM 4.71.0 (rel)) - ImageMagick - Azul Zulu OpenJDK: - 7 (openjdk version "1.7.0_272") @@ -177,12 +177,13 @@ compiled using version 3.2.0.0 of the Cabal library ) - 11 (openjdk version "11.0.8" 2020-07-14) - 12 (openjdk version "12.0.2" 2019-07-16) - Ant (Apache Ant(TM) version 1.10.5 compiled on March 28 2019) -- Gradle 6.6 +- Gradle 6.6.1 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) - Kind (kind v0.8.1 go1.14.2 linux/amd64) - kubectl (Client Version: v1.18.8) - helm (v3.3.0+g8a4aeec) - minikube version: v1.12.3 +- kustomize ({kustomize/v3.8.1 2020-07-16T00:58:46Z }) - oc CLI Client Version: 4.5.0-202005291417-9933eb9 - Leiningen (Leiningen 2.9.4 on Java 1.8.0_265 OpenJDK 64-Bit Server VM) - Mercurial (Mercurial Distributed SCM (version 4.5.3)) @@ -199,13 +200,13 @@ compiled using version 3.2.0.0 of the Cabal library ) Local version: Unknown) - n (6.7.0) - Parcel (1.12.4) -- TypeScript (Version 3.9.7) +- TypeScript (Version 4.0.2) - Webpack (4.44.1) - Webpack CLI (3.3.12) - Yarn (1.22.4) - Newman (5.1.2) - Bazel (bazel 3.4.1) -- Bazelisk (1.6.0) +- Bazelisk (1.6.1) - ORAS CLI 0.8.1 - PhantomJS (2.1.1) - PHP 7.1 (PHP 7.1.33-17+ubuntu18.04.1+deb.sury.org+1 (cli) (built: Aug 7 2020 14:47:20) ( NTS )) @@ -228,8 +229,8 @@ Local version: Unknown) - rustfmt (1.4.17-stable) - clippy (0.0.212) - rustdoc (1.45.2) -- bindgen (0.54.1) -- cbindgen (0.14.3) +- bindgen (0.55.1) +- cbindgen (0.14.4) - cargo audit (0.12.0) - cargo outdated (v0.9.11) - Julia (julia version 1.5.0) @@ -240,7 +241,7 @@ Local version: Unknown) - Terraform (Terraform v0.13.0) - Packer (1.6.1) - Vcpkg 2020.06.15-unknownhash -- Vercel CLI (19.2.0) +- Vercel CLI (20.0.0) - MongoDB on Linux v4.4.0 - Haveged 1.9.1-6 - Swig 3.0.12 @@ -253,7 +254,6 @@ Local version: Unknown) - Google APIs 21 - CMake 3.10.2.4988404 3.6.4111459 -- Android Support Repository 47.0.0 - Android SDK Platform-Tools 30.0.4 - Android SDK Platform 30 - Android SDK Platform 29 @@ -268,6 +268,7 @@ Local version: Unknown) - Android SDK Platform 19 - Android SDK Platform 17 - Android SDK Patch Applier v4 +- Android SDK Build-Tools 30.0.2 - Android SDK Build-Tools 30.0.1 - Android SDK Build-Tools 30.0.0 - Android SDK Build-Tools 29.0.3 @@ -340,8 +341,8 @@ Local version: Unknown) - Python: - Python 2.7.18 - Python 3.5.9 - - Python 3.6.11 - - Python 3.7.8 + - Python 3.6.12 + - Python 3.7.9 - Python 3.8.5 - PyPy: - PyPy 2.7.13 [PyPy 7.3.1 with GCC 7.3.1 20180303 (Red Hat 7.3.1-5)] @@ -361,5 +362,5 @@ Local version: Unknown) - boost 1.69.0 - boost 1.72.0 - AWS SAM CLI, version 1.1.0 -- Homebrew on Linux (Homebrew 2.4.11 -Homebrew/linuxbrew-core (git revision 99cdab; last commit 2020-08-16)) +- Homebrew on Linux (Homebrew 2.4.13 +Homebrew/linuxbrew-core (git revision 7d5ec; last commit 2020-08-24)) From 82fba472ed5b6f204042c9bab0a5dfa67fe167d4 Mon Sep 17 00:00:00 2001 From: Image generation service account Date: Wed, 26 Aug 2020 16:32:18 +0000 Subject: [PATCH 03/14] Updating readme file for ubuntu16 version 20200825.1 --- images/linux/Ubuntu1604-README.md | 49 ++++++++++++++++--------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index e8e99f3b..56c64303 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,12 +1,12 @@ # Ubuntu 16.04.7 LTS -The following software is installed on machines with the 20200817.1 update. +The following software is installed on machines with the 20200825.1 update. *** - 7-Zip 9.20 - Ansible (ansible 2.9.12) - AzCopy7 (available by azcopy alias) 7.3.0 -- AzCopy10 (available by azcopy10 alias) 10.5.1 -- Azure CLI (azure-cli 2.10.1) +- AzCopy10 (available by azcopy10 alias) 10.6.0 +- Azure CLI (azure-cli 2.10.1 *) - Azure CLI (azure-devops 0.18.0) - Basic packages: - dnsutils @@ -66,7 +66,7 @@ The following software is installed on machines with the 20200817.1 update. - yamllint - libcurl3 - Alibaba Cloud CLI (3.0.56) -- AWS CLI (aws-cli/1.18.120 Python/2.7.12 Linux/4.15.0-1092-azure botocore/1.17.43) +- AWS CLI (aws-cli/1.18.125 Python/2.7.12 Linux/4.15.0-1092-azure botocore/1.17.48) - AWS CLI Session manager plugin (1.1.61.0) - build-essential - nvm (0.35.3) @@ -78,7 +78,7 @@ Target: x86_64-unknown-linux-gnu - CMake (cmake version 3.17.0) - Docker Compose (docker-compose version 1.26.2, build eefe0d31) - Docker-Moby (Docker version 19.03.12+azure, build 0ed913b885c8919944a2e4c8d0b80a318a8dd48b) -- Docker-Buildx (0.4.1+azure) +- Docker-Buildx (0.4.2+azure) - .NET Core SDK: - 3.1.401 - 3.1.302 @@ -159,14 +159,14 @@ Target: x86_64-unknown-linux-gnu - Git-ftp (1.0.2) - Hub CLI (2.14.2) - GitHub CLI 0.11.1 -- Google Chrome (Google Chrome 84.0.4147.125 ) -- ChromeDriver 84.0.4147.30 (48b3e868b4cc0aa7e8149519690b6f6949e110a8-refs/branch-heads/4147@{#310}); Chrome Driver is available via CHROMEWEBDRIVER environment variable -- Google Cloud SDK (305.0.0) +- Google Chrome (Google Chrome 85.0.4183.83 ) +- ChromeDriver 85.0.4183.38 (9047dbc2c693f044042bbec5c91401c708c7c26a-refs/branch-heads/4183@{#779}); Chrome Driver is available via CHROMEWEBDRIVER environment variable +- Google Cloud SDK (307.0.0) - Haskell Cabal (cabal-install version 3.2.0.0 compiled using version 3.2.0.0 of the Cabal library ) - GHC (The Glorious Glasgow Haskell Compilation System, version 8.10.2) - Haskell Stack (Version 2.3.3, Git revision cb44d51bed48b723a5deb08c3348c0b3ccfc437e x86_64 hpack-0.33.0) -- Heroku (heroku/7.42.6 linux-x64 node-v12.16.2) +- Heroku (heroku/7.42.10 linux-x64 node-v12.16.2) - HHVM (HipHop VM 4.56.1 (rel)) - ImageMagick - Azul Zulu OpenJDK: @@ -176,12 +176,13 @@ compiled using version 3.2.0.0 of the Cabal library ) - 11 (openjdk version "11.0.8" 2020-07-14) - 12 (openjdk version "12.0.2" 2019-07-16) - Ant (Apache Ant(TM) version 1.9.6 compiled on July 20 2018) -- Gradle 6.6 +- Gradle 6.6.1 - Maven (Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)) - Kind (kind v0.8.1 go1.14.2 linux/amd64) - kubectl (Client Version: v1.18.8) - helm (v3.3.0+g8a4aeec) - minikube version: v1.12.3 +- kustomize ({kustomize/v3.8.1 2020-07-16T00:58:46Z }) - oc CLI Client Version: 4.5.0-202005291417-9933eb9 - Leiningen (Leiningen 2.9.4 on Java 1.8.0_265 OpenJDK 64-Bit Server VM) - Mercurial (Mercurial Distributed SCM (version 4.4.1)) @@ -197,13 +198,13 @@ compiled using version 3.2.0.0 of the Cabal library ) Local version: Unknown) - n (6.7.0) - Parcel (1.12.4) -- TypeScript (Version 3.9.7) +- TypeScript (Version 4.0.2) - Webpack (4.44.1) - Webpack CLI (3.3.12) - Yarn (1.22.4) - Newman (5.1.2) - Bazel (bazel 3.4.1) -- Bazelisk (1.6.0) +- Bazelisk (1.6.1) - ORAS CLI 0.8.1 - PhantomJS (2.1.1) - PHP 5.6 (PHP 5.6.40-30+ubuntu16.04.1+deb.sury.org+1 (cli) ) @@ -228,8 +229,8 @@ Local version: Unknown) - rustfmt (1.4.17-stable) - clippy (0.0.212) - rustdoc (1.45.2) -- bindgen (0.54.1) -- cbindgen (0.14.3) +- bindgen (0.55.1) +- cbindgen (0.14.4) - cargo audit (0.12.0) - cargo outdated (v0.9.11) - Julia (julia version 1.5.0) @@ -240,7 +241,7 @@ Local version: Unknown) - Terraform (Terraform v0.13.0) - Packer (1.6.1) - Vcpkg 2020.06.15-unknownhash -- Vercel CLI (19.2.0) +- Vercel CLI (20.0.0) - MongoDB on Linux v4.4.0 - Haveged 1.9.1-3 - Swig 3.0.8 @@ -253,9 +254,10 @@ Local version: Unknown) - Google APIs 21 - CMake 3.10.2.4988404 3.6.4111459 -- Android Support Repository 47.0.0 -- Android Solver for ConstraintLayout 1.0.2 -- Android Solver for ConstraintLayout 1.0.1 +- Android ConstraintLayout 1.0.2 +- Android ConstraintLayout 1.0.1 +- Android ConstraintLayout Solver 1.0.2 +- Android ConstraintLayout Solver 1.0.1 - Android SDK Platform-Tools 30.0.4 - Android SDK Platform 30 - Android SDK Platform 29 @@ -272,6 +274,7 @@ Local version: Unknown) - Android SDK Platform 15 - Android SDK Platform 10 - Android SDK Patch Applier v4 +- Android SDK Build-Tools 30.0.2 - Android SDK Build-Tools 30.0.1 - Android SDK Build-Tools 30.0.0 - Android SDK Build-Tools 29.0.3 @@ -306,8 +309,6 @@ Local version: Unknown) - Android SDK Build-Tools 19.1.0 - Android SDK Build-Tools 17.0.0 - Android NDK 21.3.6528147 -- Android ConstraintLayout 1.0.2 -- Android ConstraintLayout 1.0.1 - Az Module (1.0.0) - Az Module (1.6.0) - Az Module (2.3.2) @@ -346,8 +347,8 @@ Local version: Unknown) - Python: - Python 2.7.18 - Python 3.5.9 - - Python 3.6.11 - - Python 3.7.8 + - Python 3.6.12 + - Python 3.7.9 - Python 3.8.5 - PyPy: - PyPy 2.7.13 [PyPy 7.3.1 with GCC 7.3.1 20180303 (Red Hat 7.3.1-5)] @@ -367,5 +368,5 @@ Local version: Unknown) - boost 1.69.0 - boost 1.72.0 - AWS SAM CLI, version 1.1.0 -- Homebrew on Linux (Homebrew 2.4.11 -Homebrew/linuxbrew-core (git revision 99cdab; last commit 2020-08-16)) +- Homebrew on Linux (Homebrew 2.4.13 +Homebrew/linuxbrew-core (git revision 7d5ec; last commit 2020-08-24)) From 5385a075ebec9e2fe560cb4a482ed0f8514518a0 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 27 Aug 2020 10:25:56 +0300 Subject: [PATCH 04/14] Set javac version 1.8 on Ubuntu 16.04 (#1483) * set up javac version * fix update-java-alternatives * add version check * change java check * fix checks and position of update-java-alternatives * resolve comments Co-authored-by: Dmitry Shibanov --- images/linux/scripts/installers/java-tools.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh index b64c576c..7ec94b73 100644 --- a/images/linux/scripts/installers/java-tools.sh +++ b/images/linux/scripts/installers/java-tools.sh @@ -10,6 +10,15 @@ source $HELPER_SCRIPTS/os.sh set -e +function javaTool { + if [[ "$2" =~ ([1]{0,1}.)?$DEFAULT_JDK_VERSION.* ]]; then + echo "$1 $2 is equal to default one $DEFAULT_JDK_VERSION" + else + echo "$1 $2 is not equal to default one $DEFAULT_JDK_VERSION" + exit 1 + fi +} + # Install GPG Key for Adopt Open JDK. See https://adoptopenjdk.net/installation.html wget -qO - "https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public" | apt-key add - add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ @@ -38,6 +47,11 @@ apt-get -y install adoptopenjdk-8-hotspot=\* apt-get -y install adoptopenjdk-11-hotspot=\* # Set Default Java version. +if isUbuntu16; then + # issue: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=825987 + # stackoverflow: https://askubuntu.com/questions/1187136/update-java-alternatives-only-java-but-not-javac-is-changed + sed -i 's/(hl|jre|jdk|plugin|DUMMY) /(hl|jre|jdk|jdkhl|plugin|DUMMY) /g' /usr/sbin/update-java-alternatives +fi update-java-alternatives -s /usr/lib/jvm/adoptopenjdk-${DEFAULT_JDK_VERSION}-hotspot-amd64 echo "JAVA_HOME_8_X64=/usr/lib/jvm/adoptopenjdk-8-hotspot-amd64" | tee -a /etc/environment @@ -85,6 +99,11 @@ for cmd in gradle java javac mvn ant; do fi done +javaVersion=$(java -version |& head -n 1 | cut -d\" -f 2) +javaTool "Java" $javaVersion +javacVersion=$(javac -version |& cut -d" " -f2) +javaTool "Javac" $javacVersion + # Document what was added to the image echo "Lastly, documenting what we added to the metadata file" if isUbuntu16 || isUbuntu18 ; then From a014097c35ac8e3a0f89a035bf3c620cd0bd5475 Mon Sep 17 00:00:00 2001 From: "no-reply@microsoft.com" Date: Thu, 27 Aug 2020 13:54:20 +0000 Subject: [PATCH 05/14] Updating readme file for macos-10.15 version 20200825.1 --- images/macos/macos-10.15-Readme.md | 56 ++++++++++++++++-------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index dc15f6ce..bf4c9a24 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,16 +1,10 @@ # macOS info - System Version: macOS 10.15.6 (19G2021) - Kernel Version: Darwin 19.6.0 -- Image Version: 20200819.1 +- Image Version: 20200825.1 ## Installed Software ### Language and Runtime -- Java 1.7: (Zulu 7.40.0.15-CA-macosx) (build 1.7.0_272-b10) -- Java 1.8: (AdoptOpenJDK)(build 1.8.0_265-b01) (default) -- Java 11: AdoptOpenJDK (build 11.0.8+10) -- Java 12: AdoptOpenJDK (build 12.0.2+10) -- Java 13: AdoptOpenJDK (build 13.0.2+8) -- Java 14: AdoptOpenJDK (build 14.0.2+12) - Clang/LLVM 10.0.1 - gcc-8 (Homebrew GCC 8.4.0_1) 8.4.0 — available by `gcc-8` alias - gcc-9 (Homebrew GCC 9.3.0) 9.3.0 — available by `gcc-9` alias @@ -33,7 +27,7 @@ - Bundler version 2.1.4 - Carthage 0.35.0 - CocoaPods 1.9.3 -- Homebrew 2.4.12 +- Homebrew 2.4.13 - NPM 6.14.6 - Yarn 1.22.4 - NuGet 5.6.0.6489 @@ -45,11 +39,11 @@ ### Project Management - Apache Maven 3.6.3 -- Gradle 6.6 +- Gradle 6.6.1 - Apache Ant(TM) 1.10.8 ### Utilities -- Curl 7.71.1 +- Curl 7.72.0 - Git: 2.28.0 - Git LFS: 2.11.0 - GitHub CLI: 0.11.1 @@ -57,7 +51,7 @@ - GNU Wget 1.20.3 - Subversion (SVN) 1.14.0 - Packer 1.6.1 -- GNU parallel 20200722 +- GNU parallel 20200822 - OpenSSL 1.0.2t 10 Sep 2019 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl/1.0.2t)` - jq 1.6 - gpg (GnuPG) 2.2.21 @@ -72,17 +66,17 @@ - virtualbox 6.1.12r139181 - mongo v4.4.0 - mongod v4.4.0 -- Vagrant 2.2.9 +- Vagrant 2.2.10 - 7-Zip 16.02 - Newman 5.1.2 ### Tools - Fastlane 2.156.1 -- Cmake 3.18.1 +- Cmake 3.18.2 - App Center CLI 2.6.6 -- Azure CLI 2.10.1 -- AWS CLI 2.0.40 +- Azure CLI 2.11.0 +- AWS CLI 2.0.42 - AWS SAM CLI 1.1.0 - AWS Session Manager CLI 1.1.61.0 - Aliyun CLI 3.0.56 @@ -98,13 +92,22 @@ ### Browsers - Safari 13.1.2 (15609.3.5.1.3) - SafariDriver 13.1.2 (15609.3.5.1.3) -- Google Chrome 84.0.4147.135 +- Google Chrome 85.0.4183.83 - ChromeDriver 84.0.4147.30 -- Microsoft Edge 84.0.522.61 -- MSEdgeDriver 84.0.522.61 -- Mozilla Firefox 79.0 +- Microsoft Edge 84.0.522.63 +- MSEdgeDriver 84.0.522.63 +- Mozilla Firefox 80.0 - geckodriver 0.27.0 +### Java +| Version | Vendor | Environment Variable | +| --------- | ------------ | -------------------- | +| 1.7.0_272 | Zulu | JAVA_HOME_7_X64 | +| 1.8.0_265 | AdoptOpenJDK | JAVA_HOME_8_X64 | +| 11.0.8 | AdoptOpenJDK | JAVA_HOME_11_X64 | +| 12.0.2 | AdoptOpenJDK | JAVA_HOME_12_X64 | +| 13.0.2 | AdoptOpenJDK | JAVA_HOME_13_X64 | +| 14.0.2 | AdoptOpenJDK | JAVA_HOME_14_X64 | ### Cached Tools #### Ruby - 2.4.10 @@ -141,8 +144,8 @@ - Rustup 1.22.1 #### Packages -- Bindgen 0.54.1 -- Cbindgen 0.14.3 +- Bindgen 0.55.1 +- Cbindgen 0.14.4 - Cargo-outdated v0.9.11 - Cargo-audit 0.12.0 @@ -152,13 +155,13 @@ #### PowerShell Modules | Module | Version | | ---------- | ------- | -| Az | 4.5.0 | +| Az | 4.6.0 | | MarkdownPS | 1.9 | | Pester | 5.0.3 | ### Xamarin #### Visual Studio for Mac -- 8.7.1.15 +- 8.7.3.13 #### Mono - 6.12.0.90 @@ -190,7 +193,7 @@ - 6.2.0.47 #### Xamarin.Android -- 11.0.0 +- 11.0.2 - 10.3.1 - 10.2.0 - 10.1.3 @@ -202,7 +205,7 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | ------------------------------- | -| 12.0 (beta) | 12A8189h | /Applications/Xcode_12_beta.app | +| 12.0 (beta) | 12A8189n | /Applications/Xcode_12_beta.app | | 11.6 (default) | 11E708 | /Applications/Xcode_11.6.app | | 11.5 | 11E608c | /Applications/Xcode_11.5.app | | 11.4.1 | 11E503a | /Applications/Xcode_11.4.1.app | @@ -340,6 +343,7 @@ | build-tools-29.0.3 | Android SDK Build-Tools, Revision 29.0.3 | | build-tools-30.0.0 | Android SDK Build-Tools, Revision 30.0.0 | | build-tools-30.0.1 | Android SDK Build-Tools, Revision 30.0.1 | +| build-tools-30.0.2 | Android SDK Build-Tools, Revision 30.0.2 | #### Android NDKs | Version | Path | @@ -352,7 +356,7 @@ | Package Name | Version | | ---------------- | ----------- | | cmake | 3.6.4111459 | -| Android Emulator | 30.0.12 | +| Android Emulator | 30.0.26 | #### Android Google APIs | Package Name | Description | From acba4e9bfaec5730d2b173451a04c1f2f931e5eb Mon Sep 17 00:00:00 2001 From: Ryan Spletzer Date: Thu, 27 Aug 2020 11:34:37 -0400 Subject: [PATCH 06/14] Fix GoogleCloudSDK test name typo (#1438) --- images/win/scripts/Installers/Install-GoogleCloudSDK.ps1 | 2 +- images/win/scripts/Tests/Tools.Tests.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-GoogleCloudSDK.ps1 b/images/win/scripts/Installers/Install-GoogleCloudSDK.ps1 index 7123e3e4..03b9e8dd 100644 --- a/images/win/scripts/Installers/Install-GoogleCloudSDK.ps1 +++ b/images/win/scripts/Installers/Install-GoogleCloudSDK.ps1 @@ -8,4 +8,4 @@ $googleCloudSDKInstaller = "https://dl.google.com/dl/cloudsdk/channels/rapid/Goo $argumentList = @("/S", "/allusers", "/noreporting") Install-Binary -Url $googleCloudSDKInstaller -Name "GoogleCloudSDKInstaller.exe" -ArgumentList $argumentList -Invoke-PesterTests -TestFile "Tools" -TestName "GoogleCouldSDK" \ No newline at end of file +Invoke-PesterTests -TestFile "Tools" -TestName "GoogleCloudSDK" diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 88f2ca88..2ef9a791 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -130,7 +130,7 @@ Describe "InnoSetup" { } } -Describe "GoogleCouldSDK" { +Describe "GoogleCloudSDK" { It "" -TestCases @( @{ ToolName = "bq" } @{ ToolName = "gcloud" } From f6d861ee26e1ba363f75250eea234217fb2f4f86 Mon Sep 17 00:00:00 2001 From: Drew Skwiers-Koballa Date: Fri, 28 Aug 2020 00:24:23 -0700 Subject: [PATCH 07/14] update dacfx to 18.5.1 (#1477) --- images/win/scripts/Installers/Install-DACFx.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-DACFx.ps1 b/images/win/scripts/Installers/Install-DACFx.ps1 index 92db0e4e..fb50af0d 100644 --- a/images/win/scripts/Installers/Install-DACFx.ps1 +++ b/images/win/scripts/Installers/Install-DACFx.ps1 @@ -6,7 +6,7 @@ Import-Module -Name ImageHelpers -Force $InstallerName = "DacFramework.msi" -$InstallerUrl = "https://go.microsoft.com/fwlink/?linkid=2128142" +$InstallerUrl = "https://go.microsoft.com/fwlink/?linkid=2134206" Install-Binary -Url $InstallerUrl -Name $InstallerName From 2f3649bd9846f3809105c1ce8119b5a967e60381 Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Fri, 28 Aug 2020 08:25:01 +0100 Subject: [PATCH 08/14] Install NuGet when installing Mono. (#1426) --- images/linux/scripts/installers/mono.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/mono.sh b/images/linux/scripts/installers/mono.sh index 10b90583..e0f84a11 100644 --- a/images/linux/scripts/installers/mono.sh +++ b/images/linux/scripts/installers/mono.sh @@ -15,7 +15,7 @@ LSB_CODENAME=$(lsb_release -cs) apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF echo "deb https://download.mono-project.com/repo/ubuntu stable-$LSB_CODENAME main" | tee /etc/apt/sources.list.d/mono-official-stable.list apt-get update -apt-get install -y --no-install-recommends apt-transport-https mono-complete +apt-get install -y --no-install-recommends apt-transport-https mono-complete nuget # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" @@ -23,7 +23,12 @@ if ! command -v mono; then echo "mono was not installed" exit 1 fi +if ! command -v nuget; then + echo "nuget was not installed" + exit 1 +fi # Document what was added to the image echo "Lastly, documenting what we added to the metadata file" DocumentInstalledItem "Mono ($(mono --version | head -n 1))" +DocumentInstalledItem "NuGet ($(nuget | tail -n +1 | head -n 1))" # Pipe to tail before piping to head because NuGet prints an ugly error if you close its stream before it's done writing. From db45f3fcac8ea4648e950a12ec84fcade2c06204 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Fri, 28 Aug 2020 10:25:28 +0300 Subject: [PATCH 09/14] the Github CLI version fix for short version number (#1468) * the Github CLI version fix for short version number * select the string with version in command output, get the version without date Co-authored-by: Leonid Lapshin --- images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 6ce6b5b1..fb550ee6 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -222,7 +222,9 @@ function Get-NewmanVersion { } function Get-GHVersion { - return "GitHub CLI $(gh --version)" + ($(gh --version) | Select-String -Pattern "gh version") -match "gh version (?\d+\.\d+\.\d+)" | Out-Null + $ghVersion = $Matches.Version + return "GitHub CLI $ghVersion" } function Get-VisualCPPComponents { From dd8885cdc9097df1a62675e51c78c42a477e50d7 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Fri, 28 Aug 2020 10:34:51 +0300 Subject: [PATCH 10/14] Add Pulumi to Windows images (#1439) * 1242 add Pulumi to windows images * change package name * Add Pulumi version to doc generator Co-authored-by: Leonid Lapshin --- images/win/Windows2016-Azure.json | 1 + images/win/Windows2019-Azure.json | 1 + images/win/scripts/Installers/Install-Pulumi.ps1 | 8 ++++++++ .../scripts/SoftwareReport/SoftwareReport.Generator.ps1 | 1 + .../win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 4 ++++ images/win/scripts/Tests/Tools.Tests.ps1 | 6 ++++++ 6 files changed, 21 insertions(+) create mode 100644 images/win/scripts/Installers/Install-Pulumi.ps1 diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index cbfbcbad..bb871b3c 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -211,6 +211,7 @@ "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1", "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", "{{ template_dir }}/scripts/Installers/Install-Packer.ps1", + "{{ template_dir }}/scripts/Installers/Install-Pulumi.ps1", "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1" ] }, diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index e3eb9571..b66d64c5 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -200,6 +200,7 @@ "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", "{{ template_dir }}/scripts/Installers/Install-7zip.ps1", "{{ template_dir }}/scripts/Installers/Install-Packer.ps1", + "{{ template_dir }}/scripts/Installers/Install-Pulumi.ps1", "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1" ] }, diff --git a/images/win/scripts/Installers/Install-Pulumi.ps1 b/images/win/scripts/Installers/Install-Pulumi.ps1 new file mode 100644 index 00000000..5ba1851f --- /dev/null +++ b/images/win/scripts/Installers/Install-Pulumi.ps1 @@ -0,0 +1,8 @@ +################################################################################ +## File: Install-Pulumi.ps1 +## Desc: Install Pulumi +################################################################################ + +Choco-Install -PackageName pulumi + +Invoke-PesterTests -TestFile "Tools" -TestName "Pulumi" \ No newline at end of file diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 7ac161c5..eb8b35f0 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -94,6 +94,7 @@ $markdown += New-MDList -Style Unordered -Lines @( (Get-NewmanVersion), (Get-OpenSSLVersion), (Get-PackerVersion), + (Get-PulumiVersion), (Get-SQLPSVersion), (Get-SQLServerPSVersion), (Get-SVNVersion), diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index fb550ee6..e7235408 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -107,6 +107,10 @@ function Get-PackerVersion { return "Packer $(packer --version)" } +function Get-PulumiVersion { + return "Pulumi $(pulumi version)" +} + function Get-SQLPSVersion { $module = Get-Module -Name SQLPS -ListAvailable $version = $module.Version diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 2ef9a791..f4938bbb 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -187,6 +187,12 @@ Describe "PowerShell Core" { } } +Describe "Pulumi" { + It "pulumi" { + "pulumi version" | Should -ReturnZeroExitCode + } +} + Describe "Sbt" { It "sbt" { "sbt --version" | Should -ReturnZeroExitCode From 7eed5ae558c26af23a8cd0d238a672af7b1cb82e Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Fri, 28 Aug 2020 10:35:11 +0300 Subject: [PATCH 11/14] Add Pulumi to Ubuntu images (#1428) * Add Pulumi to ubuntu images * remove Pulumi from docs because it is auto-documented * change Pulumi installation script * removed legacy install, use /tmp, change auto-documentation, use download function instead of curl * include install.sh to Pulumi's installation script Co-authored-by: Leonid Lapshin --- images/linux/scripts/installers/pulumi.sh | 26 +++++++++++++++++++++++ images/linux/ubuntu1604.json | 1 + images/linux/ubuntu1804.json | 1 + images/linux/ubuntu2004.json | 1 + 4 files changed, 29 insertions(+) create mode 100644 images/linux/scripts/installers/pulumi.sh diff --git a/images/linux/scripts/installers/pulumi.sh b/images/linux/scripts/installers/pulumi.sh new file mode 100644 index 00000000..e041c2b7 --- /dev/null +++ b/images/linux/scripts/installers/pulumi.sh @@ -0,0 +1,26 @@ +#!/bin/bash +################################################################################ +## File: pulumi.sh +## Desc: Installs Pulumi +################################################################################ + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/document.sh +source $HELPER_SCRIPTS/install.sh + +# Install Pulumi +VERSION=$(curl --fail --silent -L "https://www.pulumi.com/latest-version") +TARBALL_URL="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-linux-x64.tar.gz" +download_with_retries ${TARBALL_URL} "/tmp" pulumi-v${VERSION}.tar.gz +tar --strip=1 -xvf /tmp/pulumi-v${VERSION}.tar.gz -C /usr/local/bin + +# 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 pulumi ; then + echo "Pulumi was not installed" + exit 1 +fi + +# Document what was added to the image +echo "Lastly, documenting what we added to the metadata file" +DocumentInstalledItem "Pulumi $(pulumi version)" diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 4a5c5be1..3625b7ed 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -181,6 +181,7 @@ "{{template_dir}}/scripts/installers/pollinate.sh", "{{template_dir}}/scripts/installers/postgresql.sh", "{{template_dir}}/scripts/installers/powershellcore.sh", + "{{template_dir}}/scripts/installers/pulumi.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/r.sh", "{{template_dir}}/scripts/installers/rust.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 91f468f3..b5037520 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -185,6 +185,7 @@ "{{template_dir}}/scripts/installers/pollinate.sh", "{{template_dir}}/scripts/installers/postgresql.sh", "{{template_dir}}/scripts/installers/powershellcore.sh", + "{{template_dir}}/scripts/installers/pulumi.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/r.sh", "{{template_dir}}/scripts/installers/rust.sh", diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index f3b7a68a..48d309b1 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -187,6 +187,7 @@ "{{template_dir}}/scripts/installers/pollinate.sh", "{{template_dir}}/scripts/installers/postgresql.sh", "{{template_dir}}/scripts/installers/powershellcore.sh", + "{{template_dir}}/scripts/installers/pulumi.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/r.sh", "{{template_dir}}/scripts/installers/rust.sh", From 4dd9ba84fd05fcd30b165087a6f9143e456a7475 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Fri, 28 Aug 2020 16:17:22 +0300 Subject: [PATCH 12/14] add permissions --- images/linux/scripts/installers/android.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 725bf3d3..73611e66 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -27,9 +27,6 @@ wget -O android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux unzip android-sdk.zip -d ${ANDROID_SDK_ROOT} rm -f android-sdk.zip -# Add required permissions -chmod -R a+rwx ${ANDROID_SDK_ROOT} - if isUbuntu20 ; then # Sdk manager doesn't work with Java > 8, set version 8 explicitly sed -i "2i export JAVA_HOME=${JAVA_HOME_8_X64}" /usr/local/lib/android/sdk/tools/bin/sdkmanager @@ -63,6 +60,9 @@ constraint_layout_solver_versions_list=$(echo "$extras"|awk -F';' '/constraint-l platform_versions_list=$(echo "$platforms"|awk -F- '{print $2}') buildtools_versions_list=$(echo "$buildtools"|awk -F';' '{print $2}') +# Add required permissions +chmod -R a+rwx ${ANDROID_SDK_ROOT} + echo "Lastly, document what was added to the metadata file" DocumentInstalledItem "Google Repository $(cat ${ANDROID_SDK_ROOT}/extras/google/m2repository/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)" DocumentInstalledItem "Google Play services $(cat ${ANDROID_SDK_ROOT}/extras/google/google_play_services/source.properties 2>&1 | grep Pkg.Revision | cut -d '=' -f 2)" From dd518dff50e3ec08dc55c4a63360f53a20549301 Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Fri, 28 Aug 2020 16:26:41 +0300 Subject: [PATCH 13/14] Resolve possible conflicts in software update PR (#1394) * Resolve possible conflicts in software update PR * Push updated release branch to repo * Setup committer's name and email * Minor fix * Add step to create branch for PR * Add pause before merging * Minor renaming * Add step to delete docs branch --- .github/workflows/create_pull_request.yml | 10 +++++++++- .github/workflows/merge_pull_request.yml | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_pull_request.yml b/.github/workflows/create_pull_request.yml index 36b2508c..e96085ad 100644 --- a/.github/workflows/create_pull_request.yml +++ b/.github/workflows/create_pull_request.yml @@ -11,6 +11,14 @@ jobs: steps: - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Clone release branch to create pull request + run: | + git checkout ${{ github.event.client_payload.ReleaseBranchName }} + git branch ${{ github.event.client_payload.ReleaseBranchName }}-docs + git push origin ${{ github.event.client_payload.ReleaseBranchName }}-docs - name: Create pull request for ${{ github.event.client_payload.ReleaseBranchName }} uses: actions/github-script@v2 @@ -21,7 +29,7 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, title: "${{ github.event.client_payload.PullRequestTitle }}", - head: "${{ github.event.client_payload.ReleaseBranchName }}", + head: "${{ github.event.client_payload.ReleaseBranchName }}-docs", base: "${{ github.event.client_payload.PullRequestBase }}", body: `${{ github.event.client_payload.PullRequestBody }}` }); \ No newline at end of file diff --git a/.github/workflows/merge_pull_request.yml b/.github/workflows/merge_pull_request.yml index dd6f3fc6..974082c1 100644 --- a/.github/workflows/merge_pull_request.yml +++ b/.github/workflows/merge_pull_request.yml @@ -11,6 +11,17 @@ jobs: steps: - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Resolve possible conflicts ${{ github.event.client_payload.ReleaseBranchName }} with main + run: | + git config --global user.email "no-reply@github.com" + git config --global user.name "Actions service account" + git checkout ${{ github.event.client_payload.ReleaseBranchName }}-docs + git merge --no-edit --strategy-option=ours main + git push origin ${{ github.event.client_payload.ReleaseBranchName }}-docs + sleep 30 - name: Merge pull request for ${{ github.event.client_payload.ReleaseBranchName }} uses: actions/github-script@v2 @@ -21,4 +32,15 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, pull_number: ${{ github.event.client_payload.PullRequestNumber }} + }) + + - name: Delete docs branch ${{ github.event.client_payload.ReleaseBranchName }}-docs + uses: actions/github-script@v2 + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + github.git.deleteRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: "heads/${{ github.event.client_payload.ReleaseBranchName }}-docs" }) \ No newline at end of file From 2674d46accc6e61b85e8f140aeef807403fb83d8 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 1 Sep 2020 11:59:24 +0300 Subject: [PATCH 14/14] add az 4.6.0 to toolset (#1522) Co-authored-by: Dmitry Shibanov --- images/linux/toolsets/toolset-1604.json | 3 ++- images/linux/toolsets/toolset-1804.json | 3 ++- images/win/toolsets/toolset-2016.json | 3 ++- images/win/toolsets/toolset-2019.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index c2fe19c1..40ea0af4 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -104,7 +104,8 @@ "3.5.0", "3.8.0", "4.3.0", - "4.4.0" + "4.4.0", + "4.6.0" ] } ] diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 6b4c9f08..1bd31b15 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -100,7 +100,8 @@ "3.5.0", "3.8.0", "4.3.0", - "4.4.0" + "4.4.0", + "4.6.0" ] } ] diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index f01e9473..a76246e6 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -120,7 +120,8 @@ "3.5.0", "3.8.0", "4.3.0", - "4.4.0" + "4.4.0", + "4.6.0" ] } ], diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index e29552df..48af87df 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -129,7 +129,8 @@ "3.5.0", "3.8.0", "4.3.0", - "4.4.0" + "4.4.0", + "4.6.0" ] } ],