Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macOS CI #806

Merged
merged 4 commits into from
Feb 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 59 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ jobs:

- name: Configure
run: |
New-Item -ItemType Directory build | Out-Null
Set-Location build
cmake `
-G "${{ matrix.platform.generator }}" -A "${{ matrix.platform.arch }}" `
-DPLASMA_BUILD_TESTS=ON `
Expand All @@ -42,7 +40,7 @@ jobs:
-DPLASMA_VCPKG_NUGET_OWNER="${{ github.repository_owner }}" `
-DPLASMA_VCPKG_NUGET_TOKEN="${{ secrets.GITHUB_TOKEN }}" `
-DPLASMA_VCPKG_NUGET_RW=TRUE `
..
-S . -B build

- name: Build
run: |
Expand Down Expand Up @@ -98,7 +96,62 @@ jobs:
- name: Configure
run: |
cmake \
-GNinja \
-G Ninja \
-DUSE_VCPKG=ON \
-DCMAKE_BUILD_TYPE=${{ matrix.cfg.type }} \
-DPLASMA_BUILD_TESTS=ON \
-DPLASMA_BUILD_TOOLS=ON \
-DPLASMA_EXTERNAL_RELEASE=${{ matrix.cfg.external }} \
-DPLASMA_VCPKG_NUGET_SOURCE="https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" \
-DPLASMA_VCPKG_NUGET_OWNER="${{ github.repository_owner }}" \
-DPLASMA_VCPKG_NUGET_TOKEN="${{ secrets.GITHUB_TOKEN }}" \
-DPLASMA_VCPKG_NUGET_RW=TRUE \
-S . -B build

- name: Build
run: |
cmake --build build -j 2

- name: Test
run: |
cmake --build build --target check -j 2

- name: Install
run: |
cmake --build build --target install -j 2


macos:
runs-on: macos-latest
name: ${{ matrix.platform.str }}-${{ matrix.cfg.str }}
strategy:
matrix:
platform:
- { str: macos-x64 }
cfg:
- { external: OFF, type: RelWithDebInfo, str: internal-release }
- { external: OFF, type: Debug, str: internal-debug }
- { external: ON, type: RelWithDebInfo, str: external-release }

steps:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: true

- name: Install dependencies
run: |
brew update
brew install \
autoconf \
cairo \
libtool \
nasm \
qt5

- name: Configure
run: |
cmake \
-DUSE_VCPKG=ON \
-DCMAKE_BUILD_TYPE=${{ matrix.cfg.type }} \
-DPLASMA_BUILD_TESTS=ON \
Expand All @@ -109,6 +162,8 @@ jobs:
-DPLASMA_VCPKG_NUGET_TOKEN="${{ secrets.GITHUB_TOKEN }}" \
-DPLASMA_VCPKG_NUGET_RW=TRUE \
-S . -B build
env:
CMAKE_PREFIX_PATH: "/usr/local/opt/qt"

- name: Build
run: |
Expand Down
6 changes: 5 additions & 1 deletion Sources/Plasma/PubUtilLib/plPipeline/GL/plGLDeviceRef.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h"
#include "hsGDeviceRef.h"

#include <GL/gl.h>
#if HS_BUILD_FOR_MACOS
# include <OpenGL/gl3.h>
#else
# include <GL/gl.h>
#endif

class plGLDeviceRef : public hsGDeviceRef
{
Expand Down