From 4b1bf38a767790716b7581e208a157b5ba45f359 Mon Sep 17 00:00:00 2001 From: Live session user Date: Sun, 8 Jun 2025 12:05:42 -0700 Subject: [PATCH] remove cirrus/azure references --- .ci/install-freebsd.sh | 4 ++-- .github/workflows/rpcs3.yml | 6 +----- README.md | 1 - Utilities/git-version-gen.cmd | 1 - rpcs3/git-version.cmake | 3 +-- rpcs3/rpcs3.vcxproj | 4 +--- rpcs3/rpcs3.vcxproj.filters | 6 ------ 7 files changed, 5 insertions(+), 20 deletions(-) diff --git a/.ci/install-freebsd.sh b/.ci/install-freebsd.sh index de10561dfa..724db3e140 100755 --- a/.ci/install-freebsd.sh +++ b/.ci/install-freebsd.sh @@ -3,10 +3,10 @@ # shellcheck shell=sh disable=SC2096 # RPCS3 often needs recent Qt and Vulkan-Headers -sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf +#sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf export ASSUME_ALWAYS_YES=true -pkg info # debug +#pkg info # debug # WITH_LLVM pkg install "llvm$LLVM_COMPILER_VER" diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index c63ad749c1..73c6984992 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -344,9 +344,5 @@ jobs: with: envs: 'QT_VER_MAIN LLVM_COMPILER_VER' usesh: true - prepare: | - pkg install -y "llvm$LLVM_COMPILER_VER" - pkg install -y git ccache cmake ninja "qt$QT_VER_MAIN-multimedia" "qt$QT_VER_MAIN-svg" glew openal-soft ffmpeg - pkg install -y pkgconf alsa-lib pulseaudio sdl3 evdev-proto vulkan-headers vulkan-loader - + prepare: .ci/install-freebsd.sh run: .ci/build-freebsd.sh diff --git a/README.md b/README.md index fb49b2dc01..ac6e3cd594 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ RPCS3 ===== -[![Cirrus CI - Base Branch Build Status](https://img.shields.io/cirrus/github/RPCS3/rpcs3/master?label=Cirrus%20CI&logo=cirrus-ci)](https://cirrus-ci.com/github/RPCS3/rpcs3) [![GitHub Actions](https://img.shields.io/github/actions/workflow/status/RPCS3/rpcs3/rpcs3.yml?branch=master&logo=github&label=Actions)](https://github.com/RPCS3/rpcs3/actions/workflows/rpcs3.yml) [![RPCS3 Discord Server](https://img.shields.io/discord/272035812277878785?color=5865F2&label=RPCS3%20Discord&logo=discord&logoColor=white)](https://discord.gg/rpcs3) diff --git a/Utilities/git-version-gen.cmd b/Utilities/git-version-gen.cmd index 7de2ebf28f..d79dd54995 100644 --- a/Utilities/git-version-gen.cmd +++ b/Utilities/git-version-gen.cmd @@ -112,7 +112,6 @@ if defined BUILD_SOURCEBRANCHNAME ( rem // BUILD_REPOSITORY_NAME will look like "RPCS3/rpcs3" rem // SYSTEM_PULLREQUEST_SOURCEBRANCH will look like "master" rem // BUILD_SOURCEBRANCHNAME will look like "master" - rem // See https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables set GIT_FULL_BRANCH=%BUILD_REPOSITORY_NAME%/%BUILD_SOURCEBRANCHNAME% echo GIT_FULL_BRANCH: !GIT_FULL_BRANCH! diff --git a/rpcs3/git-version.cmake b/rpcs3/git-version.cmake index fb90f84127..51c41da9d7 100644 --- a/rpcs3/git-version.cmake +++ b/rpcs3/git-version.cmake @@ -38,10 +38,9 @@ function(gen_git_version rpcs3_src_dir) set(GIT_VERSION_FILE "${rpcs3_src_dir}/git-version.h") set(GIT_VERSION_UPDATE "1") - # These environment variables are defined by Azure pipelines + # These environment variables are defined by CI # BUILD_REPOSITORY_NAME will look like "RPCS3/rpcs3" # BUILD_SOURCEBRANCHNAME will look like "master" - # See https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables if (DEFINED ENV{BUILD_REPOSITORY_NAME} AND NOT "$ENV{BUILD_REPOSITORY_NAME}" STREQUAL "") set(RPCS3_GIT_FULL_BRANCH "$ENV{BUILD_REPOSITORY_NAME}/$ENV{BUILD_SOURCEBRANCHNAME}") endif() diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 24529f58c9..868ca56856 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -1,4 +1,4 @@ - + @@ -2118,7 +2118,6 @@ - @@ -2130,7 +2129,6 @@ - diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters index da1b92047d..5874f2a6d8 100644 --- a/rpcs3/rpcs3.vcxproj.filters +++ b/rpcs3/rpcs3.vcxproj.filters @@ -1806,9 +1806,6 @@ Scripts - - CI - CI @@ -1827,9 +1824,6 @@ CI - - CI - CI