diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 340e954..c56bbbd 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -2,15 +2,15 @@ name: .NET
on: push
jobs:
- Linux_amd64:
- runs-on: ubuntu-24.04
+ Linux_Native:
+ runs-on: ubuntu-latest
container:
image: almalinux:8
env:
BUILD_TYPE: Release
steps:
- name: Cloning
- uses: actions/checkout@v5
+ uses: actions/checkout@v4
- name: Install packages
run: dnf install -y cmake gcc gcc-c++
- name: Configure CMake
@@ -20,69 +20,11 @@ jobs:
- name: Install
run: cmake --install "build" --config ${{env.BUILD_TYPE}} --prefix "install/"
- name: Upload
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v4
with:
name: AlmaLinux amd64
path: ${{github.workspace}}/install/
- Linux_arm64:
- runs-on: ubuntu-24.04-arm
- container:
- image: almalinux:8
- env:
- BUILD_TYPE: Release
- steps:
- - name: Cloning
- uses: actions/checkout@v5
- - name: Install packages
- run: dnf install -y cmake gcc gcc-c++
- - name: Configure CMake
- run: cmake -B "build" -DRAGEPHOTO_C_LIBRARY=ON -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
- - name: Build
- run: cmake --build "build" --config ${{env.BUILD_TYPE}}
- - name: Install
- run: cmake --install "build" --config ${{env.BUILD_TYPE}} --prefix "install/"
- - name: Upload
- uses: actions/upload-artifact@v5
- with:
- name: AlmaLinux arm64
- path: ${{github.workspace}}/install/
- macOS_amd64:
- runs-on: macos-15-intel
- env:
- BUILD_TYPE: Release
- steps:
- - name: Cloning
- uses: actions/checkout@v5
- - name: Configure CMake
- run: cmake -B "${{github.workspace}}/build" -DRAGEPHOTO_C_LIBRARY=ON -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -GNinja
- - name: Build
- run: cmake --build "${{github.workspace}}/build" --config ${{env.BUILD_TYPE}}
- - name: Install
- run: cmake --install "${{github.workspace}}/build" --config ${{env.BUILD_TYPE}} --prefix "${{github.workspace}}/install/"
- - name: Upload
- uses: actions/upload-artifact@v5
- with:
- name: macOS amd64
- path: ${{github.workspace}}/install/
- macOS_arm64:
- runs-on: macos-15
- env:
- BUILD_TYPE: Release
- steps:
- - name: Cloning
- uses: actions/checkout@v5
- - name: Configure CMake
- run: cmake -B "${{github.workspace}}/build" -DRAGEPHOTO_C_LIBRARY=ON -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -GNinja
- - name: Build
- run: cmake --build "${{github.workspace}}/build" --config ${{env.BUILD_TYPE}}
- - name: Install
- run: cmake --install "${{github.workspace}}/build" --config ${{env.BUILD_TYPE}} --prefix "${{github.workspace}}/install/"
- - name: Upload
- uses: actions/upload-artifact@v5
- with:
- name: macOS arm64
- path: ${{github.workspace}}/install/
- Windows:
+ Windows_Native:
runs-on: windows-latest
env:
BUILD_TYPE: Release
@@ -94,7 +36,7 @@ jobs:
- amd64_arm64
steps:
- name: Cloning
- uses: actions/checkout@v5
+ uses: actions/checkout@v4
- name: Setup MSVC
uses: ilammy/msvc-dev-cmd@v1
with:
@@ -106,12 +48,12 @@ jobs:
- name: Install
run: cmake --install "${{github.workspace}}/build" --config ${{env.BUILD_TYPE}} --prefix "${{github.workspace}}/install"
- name: Upload
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v4
with:
name: Windows MSVC ${{matrix.arch}}
path: ${{github.workspace}}/install/
Release:
- needs: [Linux_amd64, Linux_arm64, macOS_amd64, macOS_arm64, Windows]
+ needs: [Linux_Native, Windows_Native]
runs-on: windows-latest
defaults:
run:
@@ -120,68 +62,47 @@ jobs:
BUILD_TYPE: Release
steps:
- name: Cloning
- uses: actions/checkout@v5
+ uses: actions/checkout@v4
- name: Download Linux amd64 Assets
- uses: actions/download-artifact@v6
+ uses: actions/download-artifact@v4
with:
name: AlmaLinux amd64
path: assets/linux-x64
- - name: Download Linux arm64 Assets
- uses: actions/download-artifact@v6
- with:
- name: AlmaLinux arm64
- path: assets/linux-arm64
- - name: Download macOS amd64 Assets
- uses: actions/download-artifact@v6
- with:
- name: macOS amd64
- path: assets/osx-x64
- - name: Download macOS arm64 Assets
- uses: actions/download-artifact@v6
- with:
- name: macOS arm64
- path: assets/osx-arm64
- name: Download Windows MSVC amd64 Assets
- uses: actions/download-artifact@v6
+ uses: actions/download-artifact@v4
with:
name: Windows MSVC amd64
path: assets/win-x64
- - name: Download Windows MSVC arm64 Assets
- uses: actions/download-artifact@v6
- with:
- name: Windows MSVC amd64_arm64
- path: assets/win-arm64
- - name: Download Windows MSVC x86 Assets
- uses: actions/download-artifact@v6
+ - name: Download Windows MSVC amd64_x86 Assets
+ uses: actions/download-artifact@v4
with:
name: Windows MSVC amd64_x86
path: assets/win-x86
+ - name: Download Windows MSVC amd64_arm64 Assets
+ uses: actions/download-artifact@v4
+ with:
+ name: Windows MSVC amd64_arm64
+ path: assets/win-arm64
- name: Copy Assets
run: |
- mkdir -p "${{github.workspace}}\src\dotnet\runtimes\linux-arm64\native"
mkdir -p "${{github.workspace}}\src\dotnet\runtimes\linux-x64\native"
- mkdir -p "${{github.workspace}}\src\dotnet\runtimes\osx-arm64\native"
- mkdir -p "${{github.workspace}}\src\dotnet\runtimes\osx-x64\native"
mkdir -p "${{github.workspace}}\src\dotnet\runtimes\win-arm64\native"
mkdir -p "${{github.workspace}}\src\dotnet\runtimes\win-x64\native"
mkdir -p "${{github.workspace}}\src\dotnet\runtimes\win-x86\native"
- cp "${{github.workspace}}\assets\linux-arm64\lib64\libragephoto.so" "${{github.workspace}}\src\dotnet\runtimes\linux-arm64\native\libragephoto.so"
cp "${{github.workspace}}\assets\linux-x64\lib64\libragephoto.so" "${{github.workspace}}\src\dotnet\runtimes\linux-x64\native\libragephoto.so"
- cp "${{github.workspace}}\assets\osx-arm64\lib\libragephoto.dylib" "${{github.workspace}}\src\dotnet\runtimes\osx-arm64\native\libragephoto.dylib"
- cp "${{github.workspace}}\assets\osx-x64\lib\libragephoto.dylib" "${{github.workspace}}\src\dotnet\runtimes\osx-x64\native\libragephoto.dylib"
cp "${{github.workspace}}\assets\win-arm64\bin\libragephoto.dll" "${{github.workspace}}\src\dotnet\runtimes\win-arm64\native\libragephoto.dll"
cp "${{github.workspace}}\assets\win-x64\bin\libragephoto.dll" "${{github.workspace}}\src\dotnet\runtimes\win-x64\native\libragephoto.dll"
cp "${{github.workspace}}\assets\win-x86\bin\libragephoto.dll" "${{github.workspace}}\src\dotnet\runtimes\win-x86\native\libragephoto.dll"
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2
- name: Setup .NET
- uses: actions/setup-dotnet@v5
+ uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
- name: Build RagePhoto.Core
run: msbuild "${{github.workspace}}\src\dotnet\RagePhoto.Core.csproj" /t:restore /t:pack /p:Configuration=${{env.BUILD_TYPE}}
- name: Upload
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v4
with:
name: NuGet Package
path: ${{github.workspace}}\src\dotnet\bin\${{env.BUILD_TYPE}}\RagePhoto.Core.*.nupkg
diff --git a/.github/workflows/ubuntu-c.yml b/.github/workflows/ubuntu-c.yml
index 9b116a4..7498ca0 100644
--- a/.github/workflows/ubuntu-c.yml
+++ b/.github/workflows/ubuntu-c.yml
@@ -8,7 +8,7 @@ jobs:
BUILD_TYPE: Release
steps:
- name: Cloning
- uses: actions/checkout@v5
+ uses: actions/checkout@v4
- name: Install packages
run: |
sudo apt-get update -qq
@@ -20,7 +20,8 @@ jobs:
- name: Install
run: cmake --install "${{github.workspace}}/build" --config ${{env.BUILD_TYPE}} --prefix "${{github.workspace}}/install/usr/local"
- name: Upload
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v4
with:
name: Ubuntu
- path: ${{github.workspace}}/install/
+ path: |
+ ${{github.workspace}}/install/
diff --git a/.github/workflows/ubuntu-cxx.yml b/.github/workflows/ubuntu-cxx.yml
index b4ba087..fbff27b 100644
--- a/.github/workflows/ubuntu-cxx.yml
+++ b/.github/workflows/ubuntu-cxx.yml
@@ -13,7 +13,7 @@ jobs:
- 17
steps:
- name: Cloning
- uses: actions/checkout@v5
+ uses: actions/checkout@v4
- name: Install packages
run: |
sudo apt-get update -qq
@@ -25,7 +25,8 @@ jobs:
- name: Install
run: cmake --install "${{github.workspace}}/build" --config ${{env.BUILD_TYPE}} --prefix "${{github.workspace}}/install/usr/local"
- name: Upload
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v4
with:
name: Ubuntu C++${{matrix.cxxstd}}
- path: ${{github.workspace}}/install/
+ path: |
+ ${{github.workspace}}/install/
diff --git a/.github/workflows/webassembly-c.yml b/.github/workflows/webassembly-c.yml
index 477ff38..c96b371 100644
--- a/.github/workflows/webassembly-c.yml
+++ b/.github/workflows/webassembly-c.yml
@@ -8,7 +8,7 @@ jobs:
BUILD_TYPE: Release
steps:
- name: Cloning
- uses: actions/checkout@v5
+ uses: actions/checkout@v4
- name: Setup emsdk
uses: mymindstorm/setup-emsdk@v14
with:
@@ -22,7 +22,7 @@ jobs:
- name: Build
run: cmake --build "${{github.workspace}}/build" --config ${{env.BUILD_TYPE}}
- name: Upload
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v4
with:
name: WebAssembly
path: |
diff --git a/.github/workflows/webassembly-cxx.yml b/.github/workflows/webassembly-cxx.yml
index 9cae1f8..8e55e69 100644
--- a/.github/workflows/webassembly-cxx.yml
+++ b/.github/workflows/webassembly-cxx.yml
@@ -8,7 +8,7 @@ jobs:
BUILD_TYPE: Release
steps:
- name: Cloning
- uses: actions/checkout@v5
+ uses: actions/checkout@v4
- name: Setup emsdk
uses: mymindstorm/setup-emsdk@v14
with:
@@ -22,7 +22,7 @@ jobs:
- name: Build
run: cmake --build "${{github.workspace}}/build" --config ${{env.BUILD_TYPE}}
- name: Upload
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v4
with:
name: WebAssembly
path: |
diff --git a/.github/workflows/windows-c.yml b/.github/workflows/windows-c.yml
index c5545d8..c53b7da 100644
--- a/.github/workflows/windows-c.yml
+++ b/.github/workflows/windows-c.yml
@@ -14,7 +14,7 @@ jobs:
- amd64_arm64
steps:
- name: Cloning
- uses: actions/checkout@v5
+ uses: actions/checkout@v4
- name: Setup MSVC
uses: ilammy/msvc-dev-cmd@v1
with:
@@ -26,7 +26,8 @@ jobs:
- name: Install
run: cmake --install "${{github.workspace}}/build" --config ${{env.BUILD_TYPE}} --prefix "${{github.workspace}}/install"
- name: Upload
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v4
with:
name: Windows MSVC ${{matrix.arch}}
- path: ${{github.workspace}}/install/
+ path: |
+ ${{github.workspace}}/install/
diff --git a/.github/workflows/windows-cxx.yml b/.github/workflows/windows-cxx.yml
index 64af6cb..b956dc6 100644
--- a/.github/workflows/windows-cxx.yml
+++ b/.github/workflows/windows-cxx.yml
@@ -17,7 +17,7 @@ jobs:
- 17
steps:
- name: Cloning
- uses: actions/checkout@v5
+ uses: actions/checkout@v4
- name: Setup MSVC
uses: ilammy/msvc-dev-cmd@v1
with:
@@ -29,7 +29,8 @@ jobs:
- name: Install
run: cmake --install "${{github.workspace}}/build" --config ${{env.BUILD_TYPE}} --prefix "${{github.workspace}}/install"
- name: Upload
- uses: actions/upload-artifact@v5
+ uses: actions/upload-artifact@v4
with:
name: Windows MSVC C++${{matrix.cxxstd}} ${{matrix.arch}}
- path: ${{github.workspace}}/install/
+ path: |
+ ${{github.workspace}}/install/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index df8e7f4..0eba43b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@
cmake_minimum_required(VERSION 3.16)
cmake_policy(VERSION 3.16...3.28)
-project(ragephoto VERSION 0.7.1 LANGUAGES C CXX)
+project(ragephoto VERSION 0.7.0 LANGUAGES C CXX)
include(GNUInstallDirs)
# RagePhoto CMake includes
diff --git a/src/core/RagePhoto.c b/src/core/RagePhoto.c
index 4821961..198a2c3 100644
--- a/src/core/RagePhoto.c
+++ b/src/core/RagePhoto.c
@@ -1207,7 +1207,7 @@ void ragephoto_setphotodesc(ragephoto_t instance_t, const char *description, uin
}
if (bufferSize != 0) {
instance->data->descBuffer = bufferSize;
- ragephotodata_setbufferoffsets(instance->data);
+ ragephoto_setbufferoffsets(instance->data);
}
instance->data->error = RAGEPHOTO_ERROR_NOERROR; // 255
}
diff --git a/src/dotnet/RagePhoto.Core.csproj b/src/dotnet/RagePhoto.Core.csproj
index 0cb99f7..4c429ee 100644
--- a/src/dotnet/RagePhoto.Core.csproj
+++ b/src/dotnet/RagePhoto.Core.csproj
@@ -4,9 +4,9 @@
netstandard2.1;net47
RagePhoto.Core
RagePhoto
- 0.7.1
- 0.7.1
- 0.7.1
+ 0.7.0
+ 0.7.0
+ 0.7.0
Syping
Copyright © 2025 Syping
Open Source RAGE Photo Parser for GTA V and RDR 2