upgrade to larger instance for msvc2019/2022 CI

aws · Oct 13, 2023 · 6a44406 · 6a44406
1 parent 0580747
commit 6a44406
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -4,7 +4,7 @@ on:
     branches: [ '*' ]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 env:
@@ -14,7 +14,7 @@ env:
 
 jobs:
   MSVC-2019:
-    runs-on: windows-2019
+    runs-on: temporary-performance-testing_windows-2019_8-core
     steps:
       - name: Git clone the repository
         uses: actions/checkout@v3
@@ -27,7 +27,7 @@ jobs:
           .\tests\ci\run_windows_tests.bat "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
 
   MSVC-2022:
-    runs-on: windows-2022
+    runs-on: temporary-performance-testing_windows-latest_8-core
     steps:
       - name: Git clone the repository
         uses: actions/checkout@v3

diff --git a/crypto/impl_dispatch_test.cc b/crypto/impl_dispatch_test.cc
@@ -210,7 +210,7 @@ TEST_F(ImplDispatchTest, AES_single_block) {
 }
 
 // TODO(CryptoAlg-2137): Fix SHA256 dispatch test failure on newer 32-bit Intel
-// processors that happens only on Debug Builds.
+// processors that happens only on Windows Debug Builds.
 #if !(defined(OPENSSL_WINDOWS) && defined(OPENSSL_X86) && !defined(NDEBUG))
 TEST_F(ImplDispatchTest, SHA256) {
   AssertFunctionsHit(

diff --git a/tests/ci/cdk/cdk/codebuild/github_ci_windows_x86_omnibus.yaml b/tests/ci/cdk/cdk/codebuild/github_ci_windows_x86_omnibus.yaml
@@ -7,7 +7,7 @@ version: 0.2
 batch:
   build-list:
     - identifier: windows_msvc2015_x64
-      buildspec: ./tests/ci/codebuild/windows-x86/run_windows_target.yml
+      buildspec: ./tests/ci/codebuild/windows/run_windows_target.yml
       env:
         # https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html
         type: WINDOWS_SERVER_2019_CONTAINER
@@ -20,7 +20,7 @@ batch:
           ARCH_OPTION: x64
 
     - identifier: windows_msvc2017_x64
-      buildspec: ./tests/ci/codebuild/windows-x86/run_windows_target.yml
+      buildspec: ./tests/ci/codebuild/windows/run_windows_target.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         privileged-mode: false

diff --git a/...ebuild/windows-x86/run_windows_target.yml → .../codebuild/windows/run_windows_target.yml b/...ebuild/windows-x86/run_windows_target.yml → .../codebuild/windows/run_windows_target.yml