diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests index 79f43a3b6e7..17a7cedb4a7 100644 --- a/.ci/docker/conan-tests +++ b/.ci/docker/conan-tests @@ -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 diff --git a/test/conftest.py b/test/conftest.py index 662e73629d8..9c9c76f7846 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -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"}, diff --git a/test/functional/toolchains/test_premake.py b/test/functional/toolchains/test_premake.py index 8ff701979f4..5f87e3ede36 100644 --- a/test/functional/toolchains/test_premake.py +++ b/test/functional/toolchains/test_premake.py @@ -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