More cleanup

2023-08-30 10:09:23 -07:00 · 2023-08-30 10:09:23 -07:00 · c0a7db8899
parent dd4df6a46b
commit c0a7db8899
3 changed files with 89 additions and 101 deletions
--- a/.ci/build-linux.sh
+++ b/.ci/build-linux.sh
@ -4,6 +4,8 @@ if [ -z "$CIRRUS_CI" ]; then
   cd rpcs3 || exit 1
 fi

+git config --global --add safe.directory '*'
+
 # Pull all the submodules except llvm
 # Note: Tried to use git submodule status, but it takes over 20 seconds
 # shellcheck disable=SC2046
--- a/.cirrus.yml
+++ b/.cirrus.yml
@ -9,100 +9,95 @@ env:
  QT_VER_MAIN: '6'
  QT_VER: '6.5.2'

-windows_task:
-  matrix:
-    - name: Cirrus Windows
-      windows_container:
-        image: cirrusci/windowsservercore:visualstudio2019
-        cpu: 8
-        memory: 16G
-  env:
-    CIRRUS_SHELL: "bash"
-    COMPILER: msvc
-    BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\
-    QT_VER_MSVC: 'msvc2019'
-    QT_DATE: '202307080351'
-    QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64
-    VULKAN_VER: '1.3.224.1'
-    VULKAN_SDK_SHA: '2029e652e39ee6a6036cff3765da31e1e6c595fd2413d3cd111dfab7855621ea'
-    VULKAN_SDK: C:\VulkanSDK\${VULKAN_VER}
-    CACHE_DIR: "./cache"
-    UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
-    UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-win"
-  deps_cache:
-    folder: "./cache"
-  #obj_cache:
-  #  folder: "./tmp"
-  #obj2_cache:
-  #  folder: "./rpcs3/x64"
-  setup_script:
-    - './.ci/get_keys-windows.sh'
-    - './.ci/setup-windows.sh'
-#   - choco install -y python # Needed for SPIRV, use either this or make a new Docker image
-#  spirv_script:
-#   - export PATH=${PATH}:"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"
-#   - cd "${CIRRUS_WORKING_DIR}/3rdparty/SPIRV"
-#   - msbuild.exe spirv.vcxproj //p:Configuration=Release //m
-  rpcs3_script:
-    - export PATH=${PATH}:"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"
-    - msbuild.exe rpcs3.sln //p:Configuration=Release //m
-  deploy_script:
-    - mkdir artifacts
-    - source './.ci/export-cirrus-vars.sh'
-    - './.ci/deploy-windows.sh'
-  artifacts:
-    name: Artifact
-    path: "*.7z*"
-  push_script: |
-    if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ]; then
-      source './.ci/export-cirrus-vars.sh'
-      './.ci/github-upload.sh'
-    fi;
+# windows_task:
+#   matrix:
+#     - name: Cirrus Windows
+#       windows_container:
+#         image: cirrusci/windowsservercore:visualstudio2019
+#         cpu: 8
+#         memory: 16G
+#   env:
+#     CIRRUS_SHELL: "bash"
+#     COMPILER: msvc
+#     BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\
+#     QT_VER_MSVC: 'msvc2019'
+#     QT_DATE: '202307080351'
+#     QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64
+#     VULKAN_VER: '1.3.224.1'
+#     VULKAN_SDK_SHA: '2029e652e39ee6a6036cff3765da31e1e6c595fd2413d3cd111dfab7855621ea'
+#     VULKAN_SDK: C:\VulkanSDK\${VULKAN_VER}
+#     CACHE_DIR: "./cache"
+#     UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
+#     UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-win"
+#   deps_cache:
+#     folder: "./cache"
+#   #obj_cache:
+#   #  folder: "./tmp"
+#   #obj2_cache:
+#   #  folder: "./rpcs3/x64"
+#   setup_script:
+#     - './.ci/get_keys-windows.sh'
+#     - './.ci/setup-windows.sh'
+#   rpcs3_script:
+#     - export PATH=${PATH}:"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"
+#     - msbuild.exe rpcs3.sln //p:Configuration=Release //m
+#   deploy_script:
+#     - mkdir artifacts
+#     - source './.ci/export-cirrus-vars.sh'
+#     - './.ci/deploy-windows.sh'
+#   artifacts:
+#     name: Artifact
+#     path: "*.7z*"
+#   push_script: |
+#     if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ]; then
+#       source './.ci/export-cirrus-vars.sh'
+#       './.ci/github-upload.sh'
+#     fi;

-linux_task:
-  container:
-    image: rpcs3/rpcs3-ci-focal:1.1
-    cpu: 4
-    memory: 16G
-  env:
-    BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}/artifacts
-    ARTDIR: ${CIRRUS_WORKING_DIR}/artifacts/
-    CCACHE_DIR: "/tmp/ccache_dir"
-    CCACHE_MAXSIZE: 300M
-    CI_HAS_ARTIFACTS: true
-    UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f
-    UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux"
-    DEPLOY_APPIMAGE: true
-    APPDIR: "./appdir"
-    RELEASE_MESSAGE: "../GitHubReleaseMessage.txt"
-  ccache_cache:
-    folder: "/tmp/ccache_dir"
-  matrix:
-    - name: Cirrus Linux GCC
-      env:
-        COMPILER: gcc
-      gcc_script:
-        - mkdir artifacts
-        - ".ci/build-linux.sh"
-    - name: Cirrus Linux Clang
-      env:
-        COMPILER: clang
-      clang_script:
-        - mkdir artifacts
-        - ".ci/build-linux.sh"
-  artifacts:
-    name: Artifact
-    path: "artifacts/*"
-  push_script: |
-    if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ] && [ "$COMPILER" = "gcc" ]; then
-      COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp)
-      COMM_COUNT=$(git rev-list --count HEAD)
-      COMM_HASH=$(git rev-parse --short=8 HEAD)
+# linux_task:
+#   container:
+#     image: rpcs3/rpcs3-ci-focal:1.1
+#     cpu: 4
+#     memory: 16G
+#   env:
+#     BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}/artifacts
+#     ARTDIR: ${CIRRUS_WORKING_DIR}/artifacts/
+#     CCACHE_DIR: "/tmp/ccache_dir"
+#     CCACHE_MAXSIZE: 300M
+#     CI_HAS_ARTIFACTS: true
+#     UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f
+#     UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux"
+#     DEPLOY_APPIMAGE: true
+#     APPDIR: "./appdir"
+#     RELEASE_MESSAGE: "../GitHubReleaseMessage.txt"
+#   ccache_cache:
+#     folder: "/tmp/ccache_dir"
+#   matrix:
+#     - name: Cirrus Linux GCC
+#       env:
+#         COMPILER: gcc
+#       gcc_script:
+#         - mkdir artifacts
+#         - ".ci/build-linux.sh"
+#     - name: Cirrus Linux Clang
+#       env:
+#         COMPILER: clang
+#       clang_script:
+#         - mkdir artifacts
+#         - ".ci/build-linux.sh"
+#   artifacts:
+#     name: Artifact
+#     path: "artifacts/*"
+#   push_script: |
+#     if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ] && [ "$COMPILER" = "gcc" ]; then
+#       COMM_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp)
+#       COMM_COUNT=$(git rev-list --count HEAD)
+#       COMM_HASH=$(git rev-parse --short=8 HEAD)

-      export AVVER="${COMM_TAG}-${COMM_COUNT}"
+#       export AVVER="${COMM_TAG}-${COMM_COUNT}"

-      .ci/github-upload.sh
-    fi;
+#       .ci/github-upload.sh
+#     fi;

 freebsd_task:
  matrix:
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -98,14 +98,6 @@ jobs:
    - bash: .ci/export-azure-vars.sh
      displayName: Export Variables

-    - task: MSBuild@1
-      inputs:
-        solution: './3rdparty/SPIRV/spirv.vcxproj'
-        maximumCpuCount: true
-        platform: x64
-        configuration: 'Release'
-      displayName: Compile SPIRV-Tools
-
    - task: VSBuild@1
      inputs:
        solution: 'rpcs3.sln'
@ -121,8 +113,7 @@ jobs:
      condition: succeeded()
      artifact: RPCS3 for Windows

-    - bash: |
-        .ci/github-upload.sh
+    - bash: .ci/github-upload.sh
      condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.Repository.Name'], 'RPCS3/rpcs3'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
      displayName: Push build to GitHub
      env: