salfter/OpenKJ
1
0
Fork 0
mirror of https://github.com/OpenKJ/OpenKJ.git synced 2025-10-31 09:46:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

update macos ci (#291)

Browse Source
This commit is contained in:
Adam
2025-08-08 08:27:22 -05:00
committed by GitHub
parent 00d6e15f35
commit b60900d6a6
3 changed files with 50 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
.github/workflows/macos-build.yml vendored
View File

@@ -5,9 +5,13 @@ on:
tags:
- '*.*.*'
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs:
build:
runs-on: macos-10.15
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
with:
@@ -60,78 +64,30 @@ jobs:
- name: Setup Signing Keychain
uses: apple-actions/import-codesign-certs@v1
with:
with:
p12-file-base64: ${{ secrets.MACOS_SIGNING_CERTS_P12 }}
p12-password: ${{ secrets.MACOS_SIGNING_CERTS_PASS }}
- name: Cache Qt
id: cache-qt
uses: actions/cache@v1
with:
path: ../Qt
key: ${{ runner.os }}-QtCache
- name: Install Qt
uses: jurplel/install-qt-action@v2
with:
cached: ${{ steps.cache-qt.outputs.cache-hit }}
- name: Cache GStreamer
id: cache-gstreamer
uses: actions/cache@v2
with:
path: '/Library/Frameworks/GStreamer.framework'
key: ${{ runner.os }}-gstreamer
- name: Cache GStreamer dist
id: cache-gstreamer-dist
uses: actions/cache@v2
with:
path: '/Library/Frameworks/GStreamer.framework.dist'
key: ${{ runner.os }}-gstreamer-dist
- name: Download GST Installer
if: steps.cache-gstreamer.outputs.cache-hit != 'true'
uses: carlosperate/download-file-action@v1.0.3
id: download-gst
with:
file-url: 'https://gstreamer.freedesktop.org/data/pkg/osx/1.16.3/gstreamer-1.0-1.16.3-x86_64.pkg'
file-name: 'gstreamer-1.0-1.16.3-x86_64.pkg'
location: './downloads'
- name: Download GST-Dev Installer
if: steps.cache-gstreamer-dist.outputs.cache-hit != 'true'
uses: carlosperate/download-file-action@v1.0.3
id: download-gst-dev
with:
file-url: 'https://gstreamer.freedesktop.org/data/pkg/osx/1.16.3/gstreamer-1.0-devel-1.16.3-x86_64.pkg'
file-name: 'gstreamer-1.0-devel-1.16.3-x86_64.pkg'
location: './downloads'
- name: Install GST
if: steps.cache-gstreamer.outputs.cache-hit != 'true'
run: |
sudo installer -package ${{ steps.download-gst.outputs.file-path }} -target /
sudo cp -R /Library/Frameworks/GStreamer.framework /Library/Frameworks/GStreamer.framework.dist
sudo installer -package ${{ steps.download-gst-dev.outputs.file-path }} -target /
- name: Install OSX Relocator
run: |
echo "/Library/Frameworks/Python.framework/Versions/2.7/bin" >> $GITHUB_PATH
pip2 install osxrelocator
- name: Create Build Dir
run: cmake -E make_directory ${{github.workspace}}/build
- name: Configure CMake
working-directory: ${{github.workspace}}/build
run: |
cmake .. -DCMAKE_BUILD_TYPE=Release -DBUNDLE_GSTREAMER=True -DMAC_SIGNING_IDENTITY=47W8CPBS5A -G Ninja
- name: install deps
run: brew install cmake ninja pkgconf cppunit utf8cpp qt@5 gstreamer
- name: Build
working-directory: ${{github.workspace}}/build
run: cmake --build . --parallel 4
env:
LDFLAGS: "-L/opt/homebrew/opt/qt@5/lib"
CPPFLAGS: "-I/opt/homebrew/opt/qt@5/include"
PKG_CONFIG_PATH: "/opt/homebrew/opt/qt@5/lib/pkgconfig"
QT_DIR: "/opt/homebrew/opt/qt@5/"
Qt5_DIR: "/opt/homebrew/opt/qt@5/"
run: |
cmake -DSPDLOG_USE_BUNDLED=true -DCMAKE_BUILD_TYPE=Release -DBUNDLE_GSTREAMER=True -DMAC_SIGNING_IDENTITY=47W8CPBS5A . -B build -G Ninja
ninja -C build
- name: Sign app bundle
working-directory: ${{github.workspace}}/build
run: |
@@ -175,4 +131,4 @@ jobs:
files: ${{ github.workspace }}/build/${{ env.installer_fn }}
prerelease: ${{ env.rtype != 'release' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

80
.github/workflows/macos-test.yml vendored
View File

@@ -12,73 +12,27 @@ concurrency:
jobs:
build:
runs-on: macos-10.15
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: lukka/get-cmake@latest
- name: Cache Qt
id: cache-qt
uses: actions/cache@v1
with:
path: ../Qt
key: ${{ runner.os }}-QtCache
- name: Install Qt
uses: jurplel/install-qt-action@v2
with:
cached: ${{ steps.cache-qt.outputs.cache-hit }}
- name: Cache GStreamer
id: cache-gstreamer
uses: actions/cache@v2
with:
path: '/Library/Frameworks/GStreamer.framework'
key: ${{ runner.os }}-gstreamer
- name: Cache GStreamer dist
id: cache-gstreamer-dist
uses: actions/cache@v2
with:
path: '/Library/Frameworks/GStreamer.framework.dist'
key: ${{ runner.os }}-gstreamer-dist
- name: Download GST Installer
if: steps.cache-gstreamer.outputs.cache-hit != 'true'
uses: carlosperate/download-file-action@v1.0.3
id: download-gst
with:
file-url: 'https://gstreamer.freedesktop.org/data/pkg/osx/1.16.3/gstreamer-1.0-1.16.3-x86_64.pkg'
file-name: 'gstreamer-1.0-1.16.3-x86_64.pkg'
location: './downloads'
- name: Download GST-Dev Installer
if: steps.cache-gstreamer-dist.outputs.cache-hit != 'true'
uses: carlosperate/download-file-action@v1.0.3
id: download-gst-dev
with:
file-url: 'https://gstreamer.freedesktop.org/data/pkg/osx/1.16.3/gstreamer-1.0-devel-1.16.3-x86_64.pkg'
file-name: 'gstreamer-1.0-devel-1.16.3-x86_64.pkg'
location: './downloads'
- name: Install GST
if: steps.cache-gstreamer.outputs.cache-hit != 'true'
run: |
sudo installer -package ${{ steps.download-gst.outputs.file-path }} -target /
sudo cp -R /Library/Frameworks/GStreamer.framework /Library/Frameworks/GStreamer.framework.dist
sudo installer -package ${{ steps.download-gst-dev.outputs.file-path }} -target /
- name: Create Build Dir
run: cmake -E make_directory ${{github.workspace}}/build
- name: Configure CMake
working-directory: ${{github.workspace}}/build
run: |
cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILDONLY=True -G Ninja
- name: install deps
run: brew install cmake ninja pkgconf cppunit utf8cpp qt@5 gstreamer
- name: Build
working-directory: ${{github.workspace}}/build
run: cmake --build . --parallel 4
env:
LDFLAGS: "-L/opt/homebrew/opt/qt@5/lib"
CPPFLAGS: "-I/opt/homebrew/opt/qt@5/include"
PKG_CONFIG_PATH: "/opt/homebrew/opt/qt@5/lib/pkgconfig"
QT_DIR: "/opt/homebrew/opt/qt@5/"
Qt5_DIR: "/opt/homebrew/opt/qt@5/"
run: |
cmake -DSPDLOG_USE_BUNDLED=true . -B build -G Ninja
ninja -C build
- name: Upload app
uses: actions/upload-artifact@v4
with:
path: build/openkj.app
name: openkj.app

18
CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.5...3.10)
file(READ "src/okjversion.h" vercontents)
string(REGEX MATCH "OKJ_VERSION_MAJOR ([0-9]*)" _ ${vercontents})
@@ -95,11 +95,15 @@ endif ()
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
message("macOS detected")
set(STATIC_TAGLIB True)
find_package(PkgConfig REQUIRED)
pkg_check_modules(GSTREAMER REQUIRED gstreamer-1.0 gstreamer-app-1.0 gstreamer-audio-1.0 gstreamer-pbutils-1.0 gstreamer-controller-1.0 gstreamer-video-1.0)
include_directories(
/Library/Frameworks/GStreamer.framework/Headers
${GSTREAMER_INCLUDE_DIRS}
)
link_directories(
/Library/Frameworks
${GSTREAMER_LIBRARY_DIRS}
)
if (DEFINED BUNDLE_GSTREAMER)
message("Will bundle GStreamer into the app bundle")
@@ -615,6 +619,10 @@ endif ()
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(openkj_ICON ${CMAKE_CURRENT_SOURCE_DIR}/src/Icons/OpenKJ.icns)
find_package(PkgConfig REQUIRED)
pkg_check_modules(GSTREAMER REQUIRED gstreamer-1.0 gstreamer-app-1.0 gstreamer-audio-1.0 gstreamer-pbutils-1.0 gstreamer-controller-1.0 gstreamer-video-1.0)
set_source_files_properties(${openkj_ICON} PROPERTIES
MACOSX_PACKAGE_LOCATION "Resources"
)
@@ -632,7 +640,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
)
target_link_libraries(openkj
${LIBRARIES}
"-F /Library/Frameworks -framework GStreamer"
#"-F /Library/Frameworks -framework GStreamer"
${GSTREAMER_LIBRARIES}
${GSTREAMER_FRAMEWORK}
)
if (NOT DEFINED BUILDONLY)
get_target_property(_qt5_qmake_location Qt5::qmake IMPORTED_LOCATION)