Skip to content

Commit

Permalink
adding premake to CI (#17765)
Browse files Browse the repository at this point in the history
* adding premake to CI

* correct path
  • Loading branch information
memsharded authored Feb 13, 2025
1 parent 1ee3f74 commit 0455fd6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .ci/docker/conan-tests
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ RUN mkdir -p /usr/share/bazel-$BAZEL_6/bin && \
chmod +x bazel-${BAZEL_8}-linux-x86_64 && \
mv bazel-${BAZEL_8}-linux-x86_64 /usr/share/bazel-$BAZEL_8/bin/bazel

RUN wget https://github.com/premake/premake-core/releases/download/v5.0.0-beta4/premake-5.0.0-beta4-linux.tar.gz && \
tar -xvzf premake-5.0.0-beta4-linux.tar.gz && chmod +x premake5 && mkdir /usr/share/premake && \
mv premake5 /usr/share/premake

USER conan
WORKDIR $HOME
Expand Down
3 changes: 1 addition & 2 deletions test/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,10 @@
'Darwin': '/Users/runner/Applications/bazel/8.0.0'}},
},
'premake': {
"disabled": True,
"exe": "premake5",
"default": "5.0.0",
"5.0.0": {
"path": {'Linux': '/usr/local/bin/premake5'}
"path": {'Linux': '/usr/share/premake'}
}
},
'xcodegen': {"platform": "Darwin"},
Expand Down
2 changes: 1 addition & 1 deletion test/functional/toolchains/test_premake.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from conan.test.assets.sources import gen_function_cpp


@pytest.mark.skipif(platform.system() == "Darwin", reason="Not for MacOS")
@pytest.mark.skipif(platform.system() != "Linux", reason="Only for Linux now")
@pytest.mark.tool("premake")
def test_premake(matrix_client):
c = matrix_client
Expand Down

0 comments on commit 0455fd6

Please sign in to comment.