diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d24942f..7ac5901 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ concurrency: cancel-in-progress: true env: - SFML_VERSION: 3.0.0 + SFML_VERSION: 3.0.1 defaults: run: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 678bdda..4a9c140 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,6 +13,9 @@ concurrency: group: release-${{github.ref}} cancel-in-progress: true +env: + SFML_VERSION: 3.0.1 + jobs: windows-x86: name: Windows x86 @@ -24,14 +27,14 @@ jobs: uses: actions/cache@v4 with: path: ${{ github.workspace }}/mingw32 - key: 14.2.0posix-19.1.1-12.0.0-ucrt-r2-x86 + key: 15.1.0posix-13.0.0-ucrt-r2-x86 - name: Install MinGW x86 if: steps.mingw-x86-cache.outputs.cache-hit != 'true' uses: bwoodsend/setup-winlibs-action@v1 id: winlibs-32 with: - tag: 14.2.0posix-19.1.1-12.0.0-ucrt-r2 + tag: 15.1.0posix-13.0.0-ucrt-r2 with_clang: false architecture: 32 destination: ${{ github.workspace }} @@ -41,7 +44,7 @@ jobs: uses: actions/checkout@v4 with: repository: SFML/SFML - ref: 3.0.0 + ref: ${{ env.SFML_VERSION }} path: SFML - name: Checkout CSFML @@ -111,14 +114,14 @@ jobs: uses: actions/cache@v4 with: path: ${{ github.workspace }}/mingw64 - key: 14.2.0posix-19.1.1-12.0.0-ucrt-r2-x64 + key: 15.1.0posix-13.0.0-ucrt-r2-x64 - name: Install MinGW x64 if: steps.mingw-x64-cache.outputs.cache-hit != 'true' uses: bwoodsend/setup-winlibs-action@v1 id: winlibs-64 with: - tag: 14.2.0posix-19.1.1-12.0.0-ucrt-r2 + tag: 15.1.0posix-13.0.0-ucrt-r2 with_clang: false architecture: 64 destination: ${{ github.workspace }} @@ -128,7 +131,7 @@ jobs: uses: actions/checkout@v4 with: repository: SFML/SFML - ref: 3.0.0 + ref: ${{ env.SFML_VERSION }} path: SFML - name: Checkout CSFML @@ -197,7 +200,7 @@ jobs: uses: actions/checkout@v4 with: repository: SFML/SFML - ref: 3.0.0 + ref: ${{ env.SFML_VERSION }} path: SFML - name: Checkout CSFML @@ -260,7 +263,7 @@ jobs: uses: actions/checkout@v4 with: repository: SFML/SFML - ref: 3.0.0 + ref: ${{ env.SFML_VERSION }} path: SFML - name: Checkout CSFML diff --git a/tools/nuget/build.linux.sh b/tools/nuget/build.linux.sh index 0ed8c24..b72b0dd 100755 --- a/tools/nuget/build.linux.sh +++ b/tools/nuget/build.linux.sh @@ -42,7 +42,7 @@ echo "Please note that all SFML dependencies must be installed and available to RID="$1" -SFMLBranch="3.0.0" # The branch or tag of the SFML repository to be cloned +SFMLBranch="3.0.1" # The branch or tag of the SFML repository to be cloned CSFMLDir="$(realpath ../../)" # The directory of the source code of CSFML OutDir="./CSFML/runtimes/$RID/native" # The base directory of all CSFML modules, used to copy the final libraries diff --git a/tools/nuget/build.macos.sh b/tools/nuget/build.macos.sh index f6fdcdc..e96b12b 100755 --- a/tools/nuget/build.macos.sh +++ b/tools/nuget/build.macos.sh @@ -46,7 +46,7 @@ echo "Please note that all SFML dependencies must be installed and available to RID="$1" -SFMLBranch="3.0.0" # The branch or tag of the SFML repository to be cloned +SFMLBranch="3.0.1" # The branch or tag of the SFML repository to be cloned CSFMLDir="$(grealpath "$(git rev-parse --show-toplevel)")" # The directory of the source code of CSFML OutDir="./CSFML/runtimes/$RID/native" # The base directory of all CSFML modules, used to copy the final libraries diff --git a/tools/nuget/build.win.ps1 b/tools/nuget/build.win.ps1 index cf338eb..7b88f1a 100644 --- a/tools/nuget/build.win.ps1 +++ b/tools/nuget/build.win.ps1 @@ -35,7 +35,7 @@ Write-Output "Building $RID" Write-Output "Using $Generator as the cmake generator" Write-Output "Using architecture $Architecture" -$SFMLBranch = "3.0.0" # The branch or tag of the SFML repository to be cloned +$SFMLBranch = "3.0.1" # The branch or tag of the SFML repository to be cloned $CSFMLDir = (Get-Item (git rev-parse --show-toplevel)).FullName # The directory of the source code of CSFML $OutDir = "./CSFML/runtimes/$RID/native" # The directory of all CSFML modules, used to copy the final dlls