From a3b454db70ae2c26ede07e521cc5af15db963ec5 Mon Sep 17 00:00:00 2001
From: liya2017 <Liya@cryptape.com>
Date: Thu, 4 Nov 2021 16:04:05 +0800
Subject: [PATCH 1/2] ci: move install required tools step to ci_main script

---
 .github/workflows/ci_benchmarks_windows.yaml        | 9 ---------
 .github/workflows/ci_integration_tests_windows.yaml | 9 ---------
 .github/workflows/ci_unit_tests_windows.yaml        | 9 ---------
 devtools/ci/ci_main.sh                              | 8 ++++++++
 4 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/ci_benchmarks_windows.yaml b/.github/workflows/ci_benchmarks_windows.yaml
index 802183743f..75152ffd15 100644
--- a/.github/workflows/ci_benchmarks_windows.yaml
+++ b/.github/workflows/ci_benchmarks_windows.yaml
@@ -43,15 +43,6 @@ jobs:
     runs-on: ${{ needs.prologue.outputs.windows_runner_label }}
     steps:
     - uses: actions/checkout@v2
-    - name: install required tools
-      if: ${{ needs.prologue.outputs.windows_runner_label == 'windows-2019' }}
-      run: |
-        iex (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
-        echo "$env:USERPROFILE\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        echo "${{ github.workspace }}\devtools\windows" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        scoop install git
-        scoop bucket add extras
-        scoop install llvm yasm
     - run: |
         if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then
             devtools/ci/ci_main.sh
diff --git a/.github/workflows/ci_integration_tests_windows.yaml b/.github/workflows/ci_integration_tests_windows.yaml
index 2927c58e69..b1729997a5 100644
--- a/.github/workflows/ci_integration_tests_windows.yaml
+++ b/.github/workflows/ci_integration_tests_windows.yaml
@@ -47,15 +47,6 @@ jobs:
     timeout-minutes: 70
     steps:
     - uses: actions/checkout@v2
-    - name: install required tools
-      if: ${{ needs.prologue.outputs.windows_runner_label == 'windows-2019' }}
-      run: |
-        iex (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
-        echo "$env:USERPROFILE\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        echo "${{ github.workspace }}\devtools\windows" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        scoop install git
-        scoop bucket add extras
-        scoop install llvm yasm
     - run: |
         if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then
             devtools/ci/ci_main.sh
diff --git a/.github/workflows/ci_unit_tests_windows.yaml b/.github/workflows/ci_unit_tests_windows.yaml
index 38c09b71f2..bad09e40ed 100644
--- a/.github/workflows/ci_unit_tests_windows.yaml
+++ b/.github/workflows/ci_unit_tests_windows.yaml
@@ -43,15 +43,6 @@ jobs:
     runs-on: ${{ needs.prologue.outputs.windows_runner_label }}
     steps:
     - uses: actions/checkout@v2
-    - name: install required tools
-      if: ${{ needs.prologue.outputs.windows_runner_label == 'windows-2019' }}
-      run: |
-        iex (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
-        echo "$env:USERPROFILE\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        echo "${{ github.workspace }}\devtools\windows" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        scoop install git
-        scoop bucket add extras
-        scoop install llvm yasm
     - run: |
         if [[ ${{ needs.prologue.outputs.os_skip }} == run ]] && [[ ${{ needs.prologue.outputs.job_skip }} == run ]];then
             devtools/ci/ci_main.sh
diff --git a/devtools/ci/ci_main.sh b/devtools/ci/ci_main.sh
index e8330d6cae..4a2c75faf1 100755
--- a/devtools/ci/ci_main.sh
+++ b/devtools/ci/ci_main.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 set -euo pipefail
+if [[ $RUNNER_LABEL == 'windows-2019' ]];then
+  iex (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
+  echo "$env:USERPROFILE\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+  echo "${{ github.workspace }}\devtools\windows" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+  scoop install git
+  scoop bucket add extras
+  scoop install llvm yasm
+fi
 is_self_runner=`echo $RUNNER_LABEL | awk -F '-' '{print $1}'`
 clean_threshold=40000
 available_space=`df -m "$GITHUB_WORKSPACE" | tail -1 | awk '{print $4}'`

From a58dd6d3e19fb01cc2e70fbc9c31f06f49ae016a Mon Sep 17 00:00:00 2001
From: liya2017 <Liya@cryptape.com>
Date: Thu, 4 Nov 2021 16:11:35 +0800
Subject: [PATCH 2/2] ci: move install required tools step to ci_main script

---
 devtools/ci/ci_main.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/devtools/ci/ci_main.sh b/devtools/ci/ci_main.sh
index 4a2c75faf1..c61c3618d8 100755
--- a/devtools/ci/ci_main.sh
+++ b/devtools/ci/ci_main.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -euo pipefail
-if [[ $RUNNER_LABEL == 'windows-2019' ]];then
+echo "RUNNER_LABEL is " $RUNNER_LABEL
+if [[ $RUNNER_LABEL == "windows-2019" ]];then
+   echo "test"
   iex (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
   echo "$env:USERPROFILE\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
   echo "${{ github.workspace }}\devtools\windows" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append