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

Run macOS workflows only on opengl-2 branch #1012

Merged
merged 3 commits into from
Apr 13, 2023
Merged

Conversation

louwers
Copy link
Collaborator

@louwers louwers commented Apr 13, 2023

I created a new branch opengl-2 that will stay on OpenGL 2.0 while the renderer modularization and Metal backend implementation are underway. This branch can still be used with macOS. The main branch will start using OpenGL ES 3.0 after #995 is merged.

@louwers louwers requested review from acalcutt and ntadej April 13, 2023 09:48
@louwers louwers added macOS github_actions Pull requests that update GitHub Actions code labels Apr 13, 2023
@louwers louwers self-assigned this Apr 13, 2023
@ntadej
Copy link
Collaborator

ntadej commented Apr 13, 2023

We should still build on main to make sure the code compiles. Only tests should be disabled.

@louwers
Copy link
Collaborator Author

louwers commented Apr 13, 2023

@ntadej Do you think we should disable the tests or still run them for the opengl-2 branch?

@ntadej
Copy link
Collaborator

ntadej commented Apr 13, 2023

In main, everythng should run but (render) tests for macOS.

In opengl-2, everything should run as now.

@louwers louwers requested a review from mwilsnd April 13, 2023 19:08
@louwers
Copy link
Collaborator Author

louwers commented Apr 13, 2023

@ntadej I enabled the macOS Objective-C tests on main.

The Node CI fails to build due to a missing header on macOS.

In opengl-2, everything should run as now.

This is the case.

@mwilsnd
Copy link
Collaborator

mwilsnd commented Apr 13, 2023

Let me see what all is involved in keeping mac building on main - we probably need to create stub gl* functions to satisfy the linker.

@louwers louwers enabled auto-merge (squash) April 13, 2023 19:20
@louwers louwers merged commit 569791b into maplibre:main Apr 13, 2023
TimSylvester added a commit to WetDogWeather/maplibre-gl-native that referenced this pull request Apr 14, 2023
…awable-1

* commit 'f100a4c5d6449307547c2da850db04b12c6a3a95':
  Minor reorg of defines.
  Removed more commented code.
  Removed commented code.
  Upgrade OpenGL backend to ES 3.0 (maplibre#995)
  Run macOS workflows only on `opengl-2` branch (maplibre#1012)
  Roll back linux metrics submit along with macos metrics. (maplibre#1009)
ntadej pushed a commit to ntadej/maplibre-native that referenced this pull request Apr 15, 2023
ntadej pushed a commit to ntadej/maplibre-native that referenced this pull request Apr 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
github_actions Pull requests that update GitHub Actions code macOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants