[PATCH v3 0/1] MR474: Draft: Test running the shader runner on the correct test data on Windows.

[Giovanni Mascellani (＠giomasce)]

So far this MR is just for experimentation, do not review it.

--
  v3: Test.
 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/474

[PATCH v3 1/1] Test.

[Giovanni Mascellani]

From: Giovanni Mascellani <gmascellani(a)codeweavers.com>

---
 gitlab/build.yml | 142 -----------------------------------------------
 gitlab/test.yml  |  34 +++---------
 2 files changed, 9 insertions(+), 167 deletions(-)

diff --git a/gitlab/build.yml b/gitlab/build.yml
index 9695a3042..d7b9aff81 100644
--- a/gitlab/build.yml
+++ b/gitlab/build.yml
@@ -24,145 +24,3 @@
     when: always
     paths:
       - artifacts
-
-build-radv-64:
-  extends: .build-linux
-  tags:
-    - amd-gpu
-  variables:
-    VK_LOADER_DRIVERS_SELECT: 'radeon_*'
-    VKD3D_SHADER_CONFIG: 'force_validation'
-
-build-llvmpipe-64:
-  extends: .build-linux
-  allow_failure:
-    exit_codes:
-      - 2
-  variables:
-    VK_LOADER_DRIVERS_SELECT: 'lvp_*'
-    VKD3D_SHADER_CONFIG: 'force_validation'
-
-build-radv-32:
-  extends: .build-linux
-  tags:
-    - amd-gpu
-  variables:
-    VK_LOADER_DRIVERS_SELECT: 'radeon_*'
-    CC: 'gcc -m32'
-    VKD3D_SHADER_CONFIG: 'force_validation'
-
-build-llvmpipe-32:
-  extends: .build-linux
-  allow_failure:
-    exit_codes:
-      - 2
-  variables:
-    VK_LOADER_DRIVERS_SELECT: 'lvp_*'
-    CC: 'gcc -m32'
-    VKD3D_SHADER_CONFIG: 'force_validation'
-
-build-crosstest:
-  stage: build
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  image: $CI_REGISTRY/wine/vkd3d:debian-bookworm
-  interruptible: true
-  needs:
-    - job: build-image
-      optional: true
-  dependencies: []
-  script:
-    - git config --global --add safe.directory $CI_PROJECT_DIR
-    - git clean -fdx
-    - git reset --hard
-    - rm -fr .git/rebase-merge
-    - mkdir artifacts
-    - cat /proc/cpuinfo > artifacts/cpuinfo.txt
-    - cat /proc/meminfo > artifacts/meminfo.txt
-    - vulkaninfo > artifacts/vulkaninfo.txt
-    - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-crosstest
-    - if [ -f pipeline_failed ] ; then exit 1 ; fi
-  artifacts:
-    when: always
-    paths:
-      - artifacts
-
-.build-mingw:
-  stage: build
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  image: $CI_REGISTRY/wine/vkd3d:debian-bookworm
-  interruptible: true
-  needs:
-    - job: build-image
-      optional: true
-  dependencies: []
-  script:
-    - git config --global --add safe.directory $CI_PROJECT_DIR
-    - git clean -fdx
-    - git reset --hard
-    - rm -fr .git/rebase-merge
-    - mkdir artifacts
-    - cat /proc/cpuinfo > artifacts/cpuinfo.txt
-    - cat /proc/meminfo > artifacts/meminfo.txt
-    - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mingw
-    - if [ -f pipeline_failed ] ; then exit 1 ; fi
-  artifacts:
-    when: always
-    paths:
-      - artifacts
-
-build-mingw-64:
-  extends: .build-mingw
-  variables:
-    HOST: "x86_64-w64-mingw32"
-
-build-mingw-32:
-  extends: .build-mingw
-  variables:
-    HOST: "i686-w64-mingw32"
-
-build-mac:
-  stage: build
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  allow_failure:
-    exit_codes:
-      - 2
-  interruptible: true
-  needs: []
-  dependencies: []
-  tags:
-    - mac
-  script:
-    - git config --global --add safe.directory $CI_PROJECT_DIR
-    - git clean -fdx
-    - git reset --hard
-    - rm -fr .git/rebase-merge
-    # We use a custom ICD which is not marked as a portability driver,
-    # so that test programs are not confused.
-    - ./gitlab/patch_moltenvk_icd.sh
-    - export VK_DRIVER_FILES="$PWD/gitlab/MoltenVK_icd.json"
-    - mkdir artifacts
-    - system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt
-    - vulkaninfo > artifacts/vulkaninfo.txt
-    - export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
-    - git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git
-    - cd wine
-    - mkdir build
-    - cd build
-    - ../configure --enable-win64 --without-x --without-freetype
-    - make tools/widl/widl
-    - cd ../..
-    - export PATH="$PWD/wine/build/tools/widl:$PATH"
-    - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mac
-    - if [ -f build_failed ] ; then exit 1 ; fi
-    - if [ -f tests_failed ] ; then exit 2 ; fi
-  variables:
-    VKD3D_DISABLE_EXTENSIONS: "VK_EXT_descriptor_indexing"
-    VKD3D_SHADER_CONFIG: 'force_validation'
-    MVK_CONFIG_LOG_LEVEL: 1
-  artifacts:
-    when: always
-    paths:
-      - artifacts
diff --git a/gitlab/test.yml b/gitlab/test.yml
index 97bebba53..f53f9247a 100644
--- a/gitlab/test.yml
+++ b/gitlab/test.yml
@@ -3,33 +3,17 @@ test-win-64:
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   interruptible: true
-  needs:
-    - job: build-crosstest
+  # needs:
+  #   - job: build-crosstest
   tags:
     - win10-21h2
   script:
-    - ./artifacts/driver.cross64.exe
+    # - ./artifacts/driver.cross64.exe
+    - git --version
+    - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec 'echo $(git rev-parse HEAD)'
   variables:
     TEST_ARCH: "64"
-  artifacts:
-    when: always
-    paths:
-      - artifacts
-
-test-win-32:
-  stage: test
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  interruptible: true
-  needs:
-    - job: build-crosstest
-  tags:
-    - win10-21h2
-  script:
-    - ./artifacts/driver.cross64.exe
-  variables:
-    TEST_ARCH: "32"
-  artifacts:
-    when: always
-    paths:
-      - artifacts
+  # artifacts:
+  #   when: always
+  #   paths:
+  #     - artifacts
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/474