From 25eb869d5f94ff996166fe3095c5c25527b7a35a Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 12 Mar 2025 09:03:20 +0100 Subject: [PATCH 1/3] Readme: Improve build tags --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3cef1b5ca9..c6008a9384 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ RPCS3 ===== -[![Azure Build Status](https://dev.azure.com/nekotekina/nekotekina/_apis/build/status/RPCS3.rpcs3?branchName=master)](https://dev.azure.com/nekotekina/nekotekina/_build?definitionId=4&branchName=master) -[![Cirrus CI - Base Branch Build Status](https://img.shields.io/cirrus/github/RPCS3/rpcs3?label=Cirrus%20CI&logo=cirrus-ci)](https://cirrus-ci.com/github/RPCS3/rpcs3) +[![Azure Build Status](https://dev.azure.com/nekotekina/nekotekina/_apis/build/status/RPCS3.rpcs3?branchName=master)](https://dev.azure.com/nekotekina/nekotekina/_build?definitionId=8&_a=summary&repositoryFilter=4) +[![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.me/rpcs3) The world's first free and open-source PlayStation 3 emulator/debugger, written in C++ for Windows, Linux, macOS and FreeBSD. From ff21a05c960328f5b5f465d72c510a45f379dc84 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 12 Mar 2025 20:04:44 +0100 Subject: [PATCH 2/3] Always run Actions, we need them for merges --- .github/workflows/rpcs3.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index 92083698b7..81cb881675 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -5,15 +5,7 @@ defaults: shell: bash on: push: - paths-ignore: - - '.cirrus.yml' - - '.azure-pipelines.yml' - - 'README.md' pull_request: - paths-ignore: - - '.cirrus.yml' - - '.azure-pipelines.yml' - - 'README.md' workflow_dispatch: concurrency: From a108ce80155825ae81296043870fed6042ed2665 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Wed, 12 Mar 2025 21:15:42 +0100 Subject: [PATCH 3/3] CI: upgrade FreeBSD to 13.5 FreeBSD doesn't support /latest and /quarterly package repos on EOL versions. 13.4 reaches EOL on 2025-06-30, so avoid CI breakage. --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 6a7bdd0743..1ad1dc4190 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -105,7 +105,7 @@ freebsd_task: matrix: - name: Cirrus FreeBSD freebsd_instance: - image_family: freebsd-13-4 + image_family: freebsd-13-5 cpu: 8 memory: 8G env: