From c7b3b38ac52e8e14eef177d180361145e4ce2db7 Mon Sep 17 00:00:00 2001 From: Nikita Bykov Date: Tue, 10 Mar 2020 17:23:36 +0300 Subject: [PATCH 1/5] Added "Output Readme file content" step to Image generation --- images.CI/azure-pipelines/image-generation.yml | 7 +++++++ images.CI/azure-pipelines/ubuntu1604.yml | 3 ++- images.CI/azure-pipelines/ubuntu1804.yml | 3 ++- images.CI/azure-pipelines/windows2016.yml | 3 ++- images.CI/azure-pipelines/windows2019.yml | 3 ++- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 332f34add..246b36f27 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -55,6 +55,13 @@ jobs: -ImageName ${{ parameters.image_type }} ` -AccessToken $(RELEASE_TARGET_TOKEN) + - task: PowerShell@2 + displayName: 'Output Readme file content' + inputs: + targetType: 'inline' + script: | + Get-Content ((Get-ChildItem -Path "images" -Include ${{ parameters.image_readme_name }} -Recurse -Depth 1).FullName) + - task: PowerShell@2 displayName: 'Clean up resources' condition: always() diff --git a/images.CI/azure-pipelines/ubuntu1604.yml b/images.CI/azure-pipelines/ubuntu1604.yml index 8f6dcef22..b2c99337f 100644 --- a/images.CI/azure-pipelines/ubuntu1604.yml +++ b/images.CI/azure-pipelines/ubuntu1604.yml @@ -16,4 +16,5 @@ pr: jobs: - template: image-generation.yml parameters: - image_type: ubuntu1604 \ No newline at end of file + image_type: ubuntu1604 + image_readme_name: Ubuntu1604-README.md \ No newline at end of file diff --git a/images.CI/azure-pipelines/ubuntu1804.yml b/images.CI/azure-pipelines/ubuntu1804.yml index 998ba42e6..d07bbade4 100644 --- a/images.CI/azure-pipelines/ubuntu1804.yml +++ b/images.CI/azure-pipelines/ubuntu1804.yml @@ -16,4 +16,5 @@ pr: jobs: - template: image-generation.yml parameters: - image_type: ubuntu1804 \ No newline at end of file + image_type: ubuntu1804 + image_readme_name: Ubuntu1804-README.md \ No newline at end of file diff --git a/images.CI/azure-pipelines/windows2016.yml b/images.CI/azure-pipelines/windows2016.yml index 667b30bd7..f164a096d 100644 --- a/images.CI/azure-pipelines/windows2016.yml +++ b/images.CI/azure-pipelines/windows2016.yml @@ -16,4 +16,5 @@ pr: jobs: - template: image-generation.yml parameters: - image_type: Windows2016-Azure \ No newline at end of file + image_type: Windows2016-Azure + image_readme_name: Windows2016-Readme.md \ No newline at end of file diff --git a/images.CI/azure-pipelines/windows2019.yml b/images.CI/azure-pipelines/windows2019.yml index 508fa12b3..8675f087a 100644 --- a/images.CI/azure-pipelines/windows2019.yml +++ b/images.CI/azure-pipelines/windows2019.yml @@ -16,4 +16,5 @@ pr: jobs: - template: image-generation.yml parameters: - image_type: Windows2019-Azure \ No newline at end of file + image_type: Windows2019-Azure + image_readme_name: Windows2016-Readme.md \ No newline at end of file From d7aad6b116a93b5bb2012c10396dadcd3c04ad2e Mon Sep 17 00:00:00 2001 From: Nikita Bykov Date: Tue, 10 Mar 2020 17:30:00 +0300 Subject: [PATCH 2/5] Added test software to doc --- images/win/scripts/Installers/Validate-Bazel.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Validate-Bazel.ps1 b/images/win/scripts/Installers/Validate-Bazel.ps1 index 71af7df72..b4dca48c8 100644 --- a/images/win/scripts/Installers/Validate-Bazel.ps1 +++ b/images/win/scripts/Installers/Validate-Bazel.ps1 @@ -20,4 +20,5 @@ $Description = @" _Version:_ $(bazel --version)
"@ -Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description \ No newline at end of file +Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description +Add-SoftwareDetailsToMarkdown -SoftwareName "Test Software" -DescriptionMarkdown "Test Software" \ No newline at end of file From c8fe3857b9208abea9e0b43fb8115f8ef955b6ef Mon Sep 17 00:00:00 2001 From: Nikita Bykov Date: Wed, 11 Mar 2020 12:12:54 +0300 Subject: [PATCH 3/5] fixed inline script --- images.CI/azure-pipelines/image-generation.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 246b36f27..7daa4fb69 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -60,7 +60,8 @@ jobs: inputs: targetType: 'inline' script: | - Get-Content ((Get-ChildItem -Path "images" -Include ${{ parameters.image_readme_name }} -Recurse -Depth 1).FullName) + $docsPath = (Get-ChildItem -Path "images" -Include ${{ parameters.image_readme_name }} -Recurse -Depth 1 | Select-Object -First 1 + Get-Content -Path $docsPath - task: PowerShell@2 displayName: 'Clean up resources' From 0deb800ffad5fd93cd902cb3c29f6a92b1b350a3 Mon Sep 17 00:00:00 2001 From: Nikita Bykov Date: Wed, 11 Mar 2020 12:24:38 +0300 Subject: [PATCH 4/5] deleted the extra bracket --- images.CI/azure-pipelines/image-generation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.CI/azure-pipelines/image-generation.yml b/images.CI/azure-pipelines/image-generation.yml index 7daa4fb69..03b084ca8 100644 --- a/images.CI/azure-pipelines/image-generation.yml +++ b/images.CI/azure-pipelines/image-generation.yml @@ -60,7 +60,7 @@ jobs: inputs: targetType: 'inline' script: | - $docsPath = (Get-ChildItem -Path "images" -Include ${{ parameters.image_readme_name }} -Recurse -Depth 1 | Select-Object -First 1 + $docsPath = Get-ChildItem -Path "images" -Include ${{ parameters.image_readme_name }} -Recurse -Depth 1 | Select-Object -First 1 Get-Content -Path $docsPath - task: PowerShell@2 From 98167072879f3290e616dcb941fb6f297e2766b3 Mon Sep 17 00:00:00 2001 From: Nikita Bykov Date: Thu, 12 Mar 2020 10:49:59 +0300 Subject: [PATCH 5/5] removed test data --- images/win/scripts/Installers/Validate-Bazel.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/images/win/scripts/Installers/Validate-Bazel.ps1 b/images/win/scripts/Installers/Validate-Bazel.ps1 index 40857ed16..1728a9a6c 100644 --- a/images/win/scripts/Installers/Validate-Bazel.ps1 +++ b/images/win/scripts/Installers/Validate-Bazel.ps1 @@ -31,7 +31,6 @@ _Version:_ $(bazel --version)
"@ Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description -Add-SoftwareDetailsToMarkdown -SoftwareName "Test Software" -DescriptionMarkdown "Test Software" # Adding description of Bazelisk to Markdown $bazelisk_version = ((bazelisk version | Select-String "Bazelisk version:") -Split(" v"))[2]