liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6864 from kmilos/patch-1

Browse Source 
Streamline Windows build action
This commit is contained in:
Beep6581
2023-10-13 23:03:55 +02:00
committed by GitHub
parent d276a56b10 ae236073e2
commit 46e5a63b6c
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
.github/workflows/windows.yml vendored
View File

@@ -35,21 +35,22 @@ jobs:
with: with:
location: C:\msys2 location: C:\msys2
update: true update: true
msystem: MINGW64
install: | install: |
gzip gzip
git git
intltool intltool
mingw-w64-x86_64-gcc pacboy: |
mingw-w64-x86_64-make cc:p
mingw-w64-x86_64-pkg-config pkgconf:p
mingw-w64-x86_64-cmake cmake:p
mingw-w64-x86_64-ninja ninja:p
mingw-w64-x86_64-gtkmm3 gtkmm3:p
mingw-w64-x86_64-lcms2 lcms2:p
mingw-w64-x86_64-fftw fftw:p
mingw-w64-x86_64-lensfun lensfun:p
mingw-w64-x86_64-libiptcdata libiptcdata:p
mingw-w64-x86_64-exiv2 exiv2:p
- name: Configure build - name: Configure build
run: | run: |
@@ -63,11 +64,6 @@ jobs:
echo "Cache suffix is '$CACHE_SUFFIX'." echo "Cache suffix is '$CACHE_SUFFIX'."
fi fi
echo "Making build directory."
mkdir build
echo "Changing working directory to the build directory."
cd build
echo "Running CMake configure." echo "Running CMake configure."
cmake \ cmake \
-G "Ninja" \ -G "Ninja" \
@@ -75,21 +71,18 @@ jobs:
-DCACHE_NAME_SUFFIX="$CACHE_SUFFIX" \ -DCACHE_NAME_SUFFIX="$CACHE_SUFFIX" \
-DPROC_TARGET_NUMBER="1" \ -DPROC_TARGET_NUMBER="1" \
-DLENSFUNDBDIR="share/lensfun" \ -DLENSFUNDBDIR="share/lensfun" \
.. -S . -B build
echo "Recording filtered ref name." echo "Recording filtered ref name."
echo "REF_NAME_FILTERED=$REF_NAME_FILTERED" >> "$(cygpath -u $GITHUB_ENV)" echo "REF_NAME_FILTERED=$REF_NAME_FILTERED" >> "$(cygpath -u $GITHUB_ENV)"
- name: Build RawTherapee - name: Build RawTherapee
working-directory: ./build
run: | run: |
echo "Running CMake install." echo "Running CMake install."
cmake --build . --target install cmake --build build --target install
- name: Include Lensfun - name: Include Lensfun
run: | run: |
echo "Patching lensfun-update-data script."
sed -i 's/HTTPError\(, ValueError\)/URLError\1/' $(which lensfun-update-data)
echo "Updating Lensfun database." echo "Updating Lensfun database."
lensfun-update-data lensfun-update-data
echo "Creating Lensfun directory in the build directory." echo "Creating Lensfun directory in the build directory."