Browse Source

copy changes to github CI

Aleksey N. Vinogradov 1 year ago
parent
commit
b8dac708b8
4 changed files with 4 additions and 6 deletions
  1. 2 2
      .github/workflows/pack_publish.yml
  2. 2 2
      .github/workflows/test.yml
  3. 0 1
      .gitlab-ci.yml
  4. 0 1
      dist/gitlab-release.yml

+ 2 - 2
.github/workflows/pack_publish.yml

@@ -142,8 +142,8 @@ jobs:
     with:
       DISTR: windows
       arch: x64
-      sysroot_url_key: roots_mysql83_24oct12_1
-      boost_url_key: boost80_zstd_zlib
+      sysroot_url_key: roots_mysql83_jan17
+      boost_url_key: boost_80
       cmake_command: |
         mkdir build
         cd build

+ 2 - 2
.github/workflows/test.yml

@@ -569,8 +569,8 @@ jobs:
     with:
       DISTR: windows
       arch: x64
-      sysroot_url_key: roots_mysql83_jul29
-      boost_url_key: boost80_zstd_zlib
+      sysroot_url_key: roots_mysql83_jan17
+      boost_url_key: boost_80
       CTEST_CMAKE_GENERATOR: "Ninja Multi-Config"
       CTEST_CONFIGURATION_TYPE: Debug
       cache_key: build_windows_x64

+ 0 - 1
.gitlab-ci.yml

@@ -163,7 +163,6 @@ win_build:
   variables:
     DISTR: windows
     arch: x64
-    # use roots_mysql83_jul29 for another (non-gitlab) tests
     sysroot: roots_mysql83_jan17
     boost: boost_80
     CTEST_CMAKE_GENERATOR: "Ninja Multi-Config"

+ 0 - 1
dist/gitlab-release.yml

@@ -125,7 +125,6 @@ windows:
   extends: [ .build ]
   variables:
     arch: x64
-    # use roots_mysql83_jul29 for another (non-gitlab) builds
     sysroot: roots_mysql83_jan17
     boost: boost_80
     DISTR: windows