Browse Source

make github run more similar to gitlab

Aleksey N. Vinogradov 1 year ago
parent
commit
2cd8938bdd
3 changed files with 4 additions and 14 deletions
  1. 1 2
      .github/workflows/test.yml
  2. 0 7
      .github/workflows/win_test_template.yml
  3. 3 5
      .gitlab-ci.yml

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

@@ -589,8 +589,7 @@ jobs:
       CTEST_CMAKE_GENERATOR: "Ninja Multi-Config"
       CTEST_CONFIGURATION_TYPE: Debug
       cache_key: build_windows_x64
-      artifact_list: "build/xml build/src/Debug/indexer.exe build/src/Debug/searchd.exe build/src/Debug/tests.exe build/src/gtests/Debug/gmanticoretest.exe build/usr"
-
+      artifact_list: "build/xml build/src/Debug/indexer.exe build/src/Debug/searchd.exe build/src/gtests/Debug/gmanticoretest.exe build/src/Debug/*.dll build/src/gtests/Debug/*.dll build/config/*.c build/config/*.h"
   test_windows:
     if: (github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'update-buddy-version') != true
     name: Windows tests

+ 0 - 7
.github/workflows/win_test_template.yml

@@ -54,13 +54,6 @@ jobs:
           path: cache
           enableCrossOsArchive: true
           key: build_windows_x64
-      - name: Copy libraries close to the binaries
-        run: |
-          cp bundle/mysql-x64/lib/libmysql* build/src/Debug/
-          cp bundle/Expat-1.95.8-x64/Libs/libexpat* build/src/Debug/
-          cp bundle/libiconv-1.9.1-x64/lib/iconv* build/src/Debug/
-      - name: Setup Flex and Bison
-        run: Install-ChocoPackage winflexbison
       - name: Run mysql
         run: |
           C:\PROGRA~1\MySQL\"MySQL Server 8.0"\bin\mysqld.exe --initialize-insecure

+ 3 - 5
.gitlab-ci.yml

@@ -172,13 +172,11 @@ win_build:
       - build/xml
       - build/src/$CTEST_CONFIGURATION_TYPE/indexer.exe
       - build/src/$CTEST_CONFIGURATION_TYPE/searchd.exe
-      - build/src/$CTEST_CONFIGURATION_TYPE/*.dll
       - build/src/gtests/$CTEST_CONFIGURATION_TYPE/gmanticoretest.exe
+      - build/src/$CTEST_CONFIGURATION_TYPE/*.dll
       - build/src/gtests/$CTEST_CONFIGURATION_TYPE/*.dll
-      - build/usr
-# Commented out usually need, but not on our dev where everything is installed into system
-#      - build/src/$CTEST_CONFIGURATION_TYPE/*.dll
-#      - build/src/gtests/$CTEST_CONFIGURATION_TYPE/*.dll
+      - build/config/*.c
+      - build/config/*.h
   cache:
     key: win_test