diff --git a/.ci/build-freebsd.sh b/.ci/build-freebsd.sh index 3244f1a3cf..ca41393026 100755 --- a/.ci/build-freebsd.sh +++ b/.ci/build-freebsd.sh @@ -3,6 +3,7 @@ # Pull all the submodules except llvm, opencv, libpng, sdl and curl # Note: Tried to use git submodule status, but it takes over 20 seconds # shellcheck disable=SC2046 +git config --global --add safe.directory . git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ && !/opencv/ && !/libpng/ && !/libsdl-org/ && !/curl/ { print $3 }' .gitmodules) CONFIGURE_ARGS=" diff --git a/.ci/export-azure-vars.sh b/.ci/export-azure-vars.sh deleted file mode 100755 index 033dd41cc8..0000000000 --- a/.ci/export-azure-vars.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -e - -# Export variables for later stages of the Azure pipeline -# Values done in this manner will appear as environment variables -# in later stages. - -# From pure-sh-bible -# Setting 'IFS' tells 'read' where to split the string. -while IFS='=' read -r key val; do - # Skip over lines containing comments. - [ "${key##\#*}" ] || continue - echo "##vso[task.setvariable variable=$key]$val" -done < ".ci/ci-vars.env" diff --git a/.ci/export-cirrus-vars.sh b/.ci/export-cirrus-vars.sh deleted file mode 100755 index 561e77e92f..0000000000 --- a/.ci/export-cirrus-vars.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -e - -# Export variables for later stages of the Cirrus pipeline -# Values done in this manner will appear as environment variables -# in later stages. - -# From pure-sh-bible -# Setting 'IFS' tells 'read' where to split the string. -while IFS='=' read -r key val; do - # Skip over lines containing comments. - [ "${key##\#*}" ] || continue - export "$key"="$val" -done < ".ci/ci-vars.env" diff --git a/.cirrus.yml b/.cirrus.yml deleted file mode 100644 index 86d50a8ef6..0000000000 --- a/.cirrus.yml +++ /dev/null @@ -1,26 +0,0 @@ -env: - CIRRUS_CLONE_DEPTH: 0 # Unshallow clone to obtain proper GIT_VERSION - BUILD_REPOSITORY_NAME: $CIRRUS_REPO_FULL_NAME - SYSTEM_PULLREQUEST_SOURCEBRANCH: $CIRRUS_BRANCH - SYSTEM_PULLREQUEST_PULLREQUESTID: $CIRRUS_PR - BUILD_SOURCEVERSION: $CIRRUS_CHANGE_IN_REPO - BUILD_SOURCEBRANCHNAME: $CIRRUS_BRANCH - RPCS3_TOKEN: ENCRYPTED[100ebb8e3552bf2021d0ef55dccda3e58d27be5b6cab0b0b92843ef490195d3c4edaefa087e4a3b425caa6392300b9b1] - QT_VER_MAIN: '6' - QT_VER: '6.9.1' - LLVM_COMPILER_VER: '19' - -freebsd_task: - matrix: - - name: Cirrus FreeBSD - freebsd_instance: - image_family: freebsd-13-5 - cpu: 8 - memory: 8G - env: - CCACHE_MAXSIZE: 300M # 3x clean build, rounded - CCACHE_DIR: /tmp/ccache_dir - ccache_cache: - folder: /tmp/ccache_dir - install_script: "sh -ex ./.ci/install-freebsd.sh" - script: "./.ci/build-freebsd.sh" diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index b6d02dbbec..2ec497fb4d 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -319,3 +319,41 @@ jobs: with: path: ${{ env.DEPS_CACHE_DIR }} key: ${{ steps.restore-dependencies-cache.outputs.cache-primary-key }} + + FreeBSD_Build: + # Only run push event on master branch of main repo, but run all PRs + if: github.event_name != 'push' || (github.repository == 'RPCS3/rpcs3' && github.ref_name == 'master') + name: RPCS3 FreeBSD + runs-on: ubuntu-latest + env: + CCACHE_DIR: ${{ github.workspace }}/ccache + QT_VER_MAIN: '6' + LLVM_COMPILER_VER: '19' + steps: + - name: Checkout repository + uses: actions/checkout@main + with: + fetch-depth: 0 + + - name: Restore Build Ccache + uses: actions/cache/restore@main + id: restore-build-ccache + with: + path: ${{ env.CCACHE_DIR }} + key: FreeBSD-ccache-${{github.run_id}} + restore-keys: FreeBSD-ccache- + + - name: FreeBSD build + id: root + uses: vmactions/freebsd-vm@v1 + with: + envs: 'QT_VER_MAIN LLVM_COMPILER_VER CCACHE_DIR' + usesh: true + run: .ci/install-freebsd.sh && .ci/build-freebsd.sh + + - name: Save Build Ccache + if: github.ref == 'refs/heads/master' + uses: actions/cache/save@main + with: + path: ${{ env.CCACHE_DIR }} + key: ${{ steps.restore-build-ccache.outputs.cache-primary-key }} 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