Skip to content

Update for Matrix and add CI - #2

Merged
garbear merged 7 commits into
kodi-game:Matrixfrom
garbear:matrix-update
Oct 28, 2020
Merged

garbear merged 7 commits into
kodi-game:Matrixfrom
garbear:matrix-update

Conversation

@garbear

@garbear garbear commented Aug 30, 2020

Copy link
Copy Markdown

Description

This PR imports CI configuration from game.libretro and updates the code for Matrix. The version is bumped to 0.0.5.

How has this been tested?

I've tested the code updates on my retroplayer-19alpha1 branch with no issues. CI is untested

@garbear

garbear commented Aug 30, 2020

Copy link
Copy Markdown
Author

CC @VelocityRa

@VelocityRa VelocityRa left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool.
We'll have to test CI after it's merged?

@garbear

garbear commented Aug 31, 2020

Copy link
Copy Markdown
Author

@AlwinEsch Is there any CI we can set up until garbear/xbmc#86 gets upstreamed?

@AlwinEsch

Copy link
Copy Markdown

I connected Azure, this automatically generated a request here #3
Think if this request is forced, Azure should also come in it.

Unfortunately, I have no rights because of Jenkins and Travis. With Jenkins, @lrusak could help.

@lrusak

lrusak commented Aug 31, 2020

Copy link
Copy Markdown

@garbear @AlwinEsch jenkins has been added to your party

@lrusak

lrusak commented Aug 31, 2020

Copy link
Copy Markdown
In file included from /home/jenkins/workspace/binary-addons/kodi-android-aarch64-Matrix/tools/depends/target/binary-addons/game.shader.presets/src/addon.cpp:22:

/home/jenkins/workspace/binary-addons/kodi-android-aarch64-Matrix/tools/depends/target/binary-addons/game.shader.presets/src/addon.h:23:10: fatal error: 'kodi/addon-instance/ShaderPreset.h' file not found

#include <kodi/addon-instance/ShaderPreset.h>

         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 error generated.

@garbear

garbear commented Aug 31, 2020 •

Copy link
Copy Markdown
Author

The mentions of xbmc/xbmc.git in this PR should be kodi-game/xbmc.git. Will update

@garbear

garbear commented Aug 31, 2020

Copy link
Copy Markdown
Author

Updated. Does it work now?

@lrusak

lrusak commented Aug 31, 2020 •

Copy link
Copy Markdown

jenkins only knows about xbmc/xbmc.git (Leia, Matrix) so if you need to use another repo that may not work properly without changes to xbmc/pipeline-library

EDIT: I'm not sure what the best solution is for this. We could always disable jenkins until support is ready upstream at xbmc Master?

@garbear

garbear commented Sep 1, 2020

Copy link
Copy Markdown
Author

Rebased on #3

@garbear

garbear commented Oct 28, 2020

Copy link
Copy Markdown
Author

CI succeeds on Win32/Win64/Linux! This is the expanse of systems we've tested this on. Let's merge now and sort out the other platforms next.

Current failues:

Jenkins

Fails because buildPlugin(version: "Matrix") pulls in master, but we need branch retroplayer-19alpha2 at kodi-game.

Travis

Same failure I think, even though .travis.xml is set to pull retroplayer-19alpha2 from kodi-game/xbmc.

In file included from /home/travis/build/kodi-game/game.shader.presets/src/addon.cpp:22:0:
/home/travis/build/kodi-game/game.shader.presets/src/addon.h:23:10: fatal error: kodi/addon-instance/ShaderPreset.h: No such file or directory
#include <kodi/addon-instance/ShaderPreset.h>
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

macOS

Fails with error:

[ 13%] Building CXX object CMakeFiles/game.shader.presets.dir/src/log/LogAddon.cpp.o

In file included from /Users/travis/build/kodi-game/game.shader.presets/src/log/LogAddon.cpp:23:
/Users/travis/build/kodi-game/game.shader.presets/src/utils/CommonIncludes.h:23:10: fatal error: 'posix/os-types.h' file not found
#include "posix/os-types.h"
         ^~~~~~~~~~~~~~~~~~

1 error generated.

UWP

Fails with error:

Creating library D:/a/1/s/build/game.shader.presets-prefix/src/game.shader.presets-build/Release/game.shader.presets.lib and object D:/a/1/s/build/game.shader.presets-prefix/src/game.shader.presets-build/Release/game.shader.presets.exp

file_path_special.obj : error LNK2019: unresolved external symbol GetModuleHandle referenced in function fill_pathname_abbreviate_special [D:\a\1\s\build\game.shader.presets-prefix\src\game.shader.presets-build\game.shader.presets.vcxproj] [D:\a\1\s\build\game.shader.presets.vcxproj]

D:\a\1\s\build\game.shader.presets-prefix\src\game.shader.presets-build\Release\game.shader.presets.dll : fatal error LNK1120: 1 unresolved externals [D:\a\1\s\build\game.shader.presets-prefix\src\game.shader.presets-build\game.shader.presets.vcxproj] [D:\a\1\s\build\game.shader.presets.vcxproj]

##[error]The process 'C:\Program Files\CMake\bin\cmake.exe' failed with exit code 1
##[error]CMake failed with error: The process 'C:\Program Files\CMake\bin\cmake.exe' failed with exit code 1

@garbear
garbear merged commit eb274a9 into kodi-game:Matrix Oct 28, 2020
@garbear
garbear deleted the matrix-update branch October 28, 2020 14:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants