mirror of
https://github.com/RPCS3/rpcs3.git
synced 2024-11-22 02:32:36 +01:00
More cleanup
This commit is contained in:
Zion Nimchuk
Ivan
parent
dd4df6a46b
commit
c0a7db8899
@ -4,6 +4,8 @@ if [ -z "$CIRRUS_CI" ]; then
|
|||||||
cd rpcs3 || exit 1
|
cd rpcs3 || exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
git config --global --add safe.directory '*'
|
||||||
|
|
||||||
# Pull all the submodules except llvm
|
# Pull all the submodules except llvm
|
||||||
# Note: Tried to use git submodule status, but it takes over 20 seconds
|
# Note: Tried to use git submodule status, but it takes over 20 seconds
|
||||||
# shellcheck disable=SC2046
|
# shellcheck disable=SC2046
|
||||||
|
|||||||
177
.cirrus.yml
177
.cirrus.yml
@ -9,100 +9,95 @@ env:
|
|||||||
QT_VER_MAIN: '6'
|
QT_VER_MAIN: '6'
|
||||||
QT_VER: '6.5.2'
|
QT_VER: '6.5.2'
|
||||||
|
|
||||||
windows_task:
|
# windows_task:
|
||||||
matrix:
|
# matrix:
|
||||||
- name: Cirrus Windows
|
# - name: Cirrus Windows
|
||||||
windows_container:
|
# windows_container:
|
||||||
image: cirrusci/windowsservercore:visualstudio2019
|
# image: cirrusci/windowsservercore:visualstudio2019
|
||||||
cpu: 8
|
# cpu: 8
|
||||||
memory: 16G
|
# memory: 16G
|
||||||
env:
|
# env:
|
||||||
CIRRUS_SHELL: "bash"
|
# CIRRUS_SHELL: "bash"
|
||||||
COMPILER: msvc
|
# COMPILER: msvc
|
||||||
BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\
|
# BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\
|
||||||
QT_VER_MSVC: 'msvc2019'
|
# QT_VER_MSVC: 'msvc2019'
|
||||||
QT_DATE: '202307080351'
|
# QT_DATE: '202307080351'
|
||||||
QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64
|
# QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64
|
||||||
VULKAN_VER: '1.3.224.1'
|
# VULKAN_VER: '1.3.224.1'
|
||||||
VULKAN_SDK_SHA: '2029e652e39ee6a6036cff3765da31e1e6c595fd2413d3cd111dfab7855621ea'
|
# VULKAN_SDK_SHA: '2029e652e39ee6a6036cff3765da31e1e6c595fd2413d3cd111dfab7855621ea'
|
||||||
VULKAN_SDK: C:\VulkanSDK\${VULKAN_VER}
|
# VULKAN_SDK: C:\VulkanSDK\${VULKAN_VER}
|
||||||
CACHE_DIR: "./cache"
|
# CACHE_DIR: "./cache"
|
||||||
UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
|
# UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
|
||||||
UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-win"
|
# UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-win"
|
||||||
deps_cache:
|
# deps_cache:
|
||||||
folder: "./cache"
|
# folder: "./cache"
|
||||||
#obj_cache:
|
# #obj_cache:
|
||||||
# folder: "./tmp"
|
# # folder: "./tmp"
|
||||||
#obj2_cache:
|
# #obj2_cache:
|
||||||
# folder: "./rpcs3/x64"
|
# # folder: "./rpcs3/x64"
|
||||||
setup_script:
|
# setup_script:
|
||||||
- './.ci/get_keys-windows.sh'
|
# - './.ci/get_keys-windows.sh'
|
||||||
- './.ci/setup-windows.sh'
|
# - './.ci/setup-windows.sh'
|
||||||
# - choco install -y python # Needed for SPIRV, use either this or make a new Docker image
|
# rpcs3_script:
|
||||||
# spirv_script:
|
# - export PATH=${PATH}:"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"
|
||||||
# - export PATH=${PATH}:"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"
|
# - msbuild.exe rpcs3.sln //p:Configuration=Release //m
|
||||||
# - cd "${CIRRUS_WORKING_DIR}/3rdparty/SPIRV"
|
# deploy_script:
|
||||||
# - msbuild.exe spirv.vcxproj //p:Configuration=Release //m
|
# - mkdir artifacts
|
||||||
rpcs3_script:
|
# - source './.ci/export-cirrus-vars.sh'
|
||||||
- export PATH=${PATH}:"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"
|
# - './.ci/deploy-windows.sh'
|
||||||
- msbuild.exe rpcs3.sln //p:Configuration=Release //m
|
# artifacts:
|
||||||
deploy_script:
|
# name: Artifact
|
||||||
- mkdir artifacts
|
# path: "*.7z*"
|
||||||
- source './.ci/export-cirrus-vars.sh'
|
# push_script: |
|
||||||
- './.ci/deploy-windows.sh'
|
# if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ]; then
|
||||||
artifacts:
|
# source './.ci/export-cirrus-vars.sh'
|
||||||
name: Artifact
|
# './.ci/github-upload.sh'
|
||||||
path: "*.7z*"
|
# fi;
|
||||||
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:
|
# linux_task:
|
||||||
container:
|
# container:
|
||||||
image: rpcs3/rpcs3-ci-focal:1.1
|
# image: rpcs3/rpcs3-ci-focal:1.1
|
||||||
cpu: 4
|
# cpu: 4
|
||||||
memory: 16G
|
# memory: 16G
|
||||||
env:
|
# env:
|
||||||
BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}/artifacts
|
# BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}/artifacts
|
||||||
ARTDIR: ${CIRRUS_WORKING_DIR}/artifacts/
|
# ARTDIR: ${CIRRUS_WORKING_DIR}/artifacts/
|
||||||
CCACHE_DIR: "/tmp/ccache_dir"
|
# CCACHE_DIR: "/tmp/ccache_dir"
|
||||||
CCACHE_MAXSIZE: 300M
|
# CCACHE_MAXSIZE: 300M
|
||||||
CI_HAS_ARTIFACTS: true
|
# CI_HAS_ARTIFACTS: true
|
||||||
UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f
|
# UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f
|
||||||
UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux"
|
# UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux"
|
||||||
DEPLOY_APPIMAGE: true
|
# DEPLOY_APPIMAGE: true
|
||||||
APPDIR: "./appdir"
|
# APPDIR: "./appdir"
|
||||||
RELEASE_MESSAGE: "../GitHubReleaseMessage.txt"
|
# RELEASE_MESSAGE: "../GitHubReleaseMessage.txt"
|
||||||
ccache_cache:
|
# ccache_cache:
|
||||||
folder: "/tmp/ccache_dir"
|
# folder: "/tmp/ccache_dir"
|
||||||
matrix:
|
# matrix:
|
||||||
- name: Cirrus Linux GCC
|
# - name: Cirrus Linux GCC
|
||||||
env:
|
# env:
|
||||||
COMPILER: gcc
|
# COMPILER: gcc
|
||||||
gcc_script:
|
# gcc_script:
|
||||||
- mkdir artifacts
|
# - mkdir artifacts
|
||||||
- ".ci/build-linux.sh"
|
# - ".ci/build-linux.sh"
|
||||||
- name: Cirrus Linux Clang
|
# - name: Cirrus Linux Clang
|
||||||
env:
|
# env:
|
||||||
COMPILER: clang
|
# COMPILER: clang
|
||||||
clang_script:
|
# clang_script:
|
||||||
- mkdir artifacts
|
# - mkdir artifacts
|
||||||
- ".ci/build-linux.sh"
|
# - ".ci/build-linux.sh"
|
||||||
artifacts:
|
# artifacts:
|
||||||
name: Artifact
|
# name: Artifact
|
||||||
path: "artifacts/*"
|
# path: "artifacts/*"
|
||||||
push_script: |
|
# push_script: |
|
||||||
if [ "$CIRRUS_REPO_OWNER" = "RPCS3" ] && [ -z "$CIRRUS_PR" ] && [ "$CIRRUS_BRANCH" = "master" ] && [ "$COMPILER" = "gcc" ]; then
|
# 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_TAG=$(awk '/version{.*}/ { printf("%d.%d.%d", $5, $6, $7) }' ./rpcs3/rpcs3_version.cpp)
|
||||||
COMM_COUNT=$(git rev-list --count HEAD)
|
# COMM_COUNT=$(git rev-list --count HEAD)
|
||||||
COMM_HASH=$(git rev-parse --short=8 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
|
# .ci/github-upload.sh
|
||||||
fi;
|
# fi;
|
||||||
|
|
||||||
freebsd_task:
|
freebsd_task:
|
||||||
matrix:
|
matrix:
|
||||||
|
|||||||
@ -98,14 +98,6 @@ jobs:
|
|||||||
- bash: .ci/export-azure-vars.sh
|
- bash: .ci/export-azure-vars.sh
|
||||||
displayName: Export Variables
|
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
|
- task: VSBuild@1
|
||||||
inputs:
|
inputs:
|
||||||
solution: 'rpcs3.sln'
|
solution: 'rpcs3.sln'
|
||||||
@ -121,8 +113,7 @@ jobs:
|
|||||||
condition: succeeded()
|
condition: succeeded()
|
||||||
artifact: RPCS3 for Windows
|
artifact: RPCS3 for Windows
|
||||||
|
|
||||||
- bash: |
|
- bash: .ci/github-upload.sh
|
||||||
.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'))
|
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
|
displayName: Push build to GitHub
|
||||||
env:
|
env:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user