-
Notifications
You must be signed in to change notification settings - Fork 36
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
Fix CI build with core #337
Merged
Merged
Changes from 30 commits
Commits
Show all changes
35 commits
Select commit
Hold shift + click to select a range
91412c4
fix ci build with core
andiwand a1771a1
fix checkout; rm afterwards
andiwand 4b3511c
bump java version
andiwand da64946
fix build and test
andiwand 0589a30
fixfix
andiwand 4b35a3a
fix build
andiwand 1217a6a
fix build?
andiwand e7ecd2c
runs locally
andiwand 26ca5c6
fix linux build?
andiwand adb6c58
fix build; try disable package test build
andiwand 62f7730
try disable package test build
andiwand 87be0dd
use core version 4
andiwand 508adf3
revert to v3
andiwand 65e0a74
fix CoreWrapper
andiwand 5f6eb3c
try force build machine libcxx
andiwand 3b86a1c
try again
andiwand 74f7d3f
try again
andiwand cf7ec09
try again
andiwand 0956504
try again
andiwand 87fb654
try again
andiwand 74b3b1a
try again
andiwand 56fa0b3
try again
andiwand 2a00300
build missing
andiwand a181720
try again
andiwand a223ce6
try again
andiwand b070abe
try again
andiwand 1bbea67
try again
andiwand f920cc4
try again
andiwand f183eda
try again
andiwand 2b5542a
try again
andiwand e7ebeda
drop 19
andiwand 77a191d
improve conan setup documentation
TomTasche 3795a27
Merge branch 'master' into fix-ci-conan-core
andiwand deddc05
use new shiny artifactory instance
andiwand 9891604
Merge branch 'fix-ci-conan-core' of github.com:opendocument-app/OpenD…
andiwand File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,4 +5,3 @@ odrcore/3.0.0@ | |
cmake | ||
cmake_paths | ||
cmake_find_package | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
include(default) | ||
|
||
[settings] | ||
build_type=Release | ||
|
||
[env] | ||
CONAN_RUN_TESTS=False | ||
CONAN_CMAKE_GENERATOR=Ninja | ||
|
||
[conf] | ||
tools.build:skip_test=True |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
include(default) | ||
|
||
[settings] | ||
os=Android | ||
os.api_level=19 | ||
compiler=clang | ||
compiler.libcxx=c++_shared | ||
build_type=Release | ||
|
||
[env] | ||
CONAN_RUN_TESTS=False | ||
CONAN_CMAKE_GENERATOR=Ninja | ||
|
||
[conf] | ||
tools.android:ndk_path=$ENV{ANDROID_NDK_ROOT} | ||
tools.build:skip_test=True |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@TomTasche @ViliusSutkus89 do you know what should be done here? It complained about the functions being not existent and I just removed the calls for now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if I remember correctly that disables the overview of pages on the left side, so it was quite important for us! can you remember why it was removed? @ViliusSutkus89
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe it was just replaced with a different method?
What confused me is why does this break now? Are we not pinning the version correctly of this library?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the outline is now visible (black bar on the left in screenshot), which is not what we want. we can't release like that 😞 help @ViliusSutkus89
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey, is this problem still relevant? I've tried running current main version and outline isn't there
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I actually didn't try and just made it compile. Did you try @TomTasche ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did, all good!