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.

Sign up for GitHub

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

adding premake to CI #17765

Merged
merged 2 commits into from
Feb 13, 2025
Merged

adding premake to CI #17765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f1e483
adding premake to CI
memsharded Feb 12, 2025
f02bc03
correct path
memsharded Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .ci/docker/conan-tests
View file
Open in desktop
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
Comment on lines +152 to +154
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's declare above something like:

BAZEL_8=8.0.0 \
PREMAKE_5=5.0.0

So we can use it here as:

RUN wget https://github.com/premake/premake-core/releases/download/v${PREMAKE_5}-beta4/premake-${PREMAKE_5}-beta4-linux.tar.gz && \
    tar -xvzf premake-${PREMAKE_5}-beta4-linux.tar.gz && chmod +x premake5 && mkdir /usr/share/premake && \

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't plan to add or support more than 1 premake version in Conan and CI, do you think it is still necessary?

Copy link
Contributor

Choose a reason for hiding this comment

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

Not at all 👍


USER conan
WORKDIR $HOME
Expand Down
3 changes: 1 addition & 2 deletions test/conftest.py
View file
Open in desktop
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
View file
Open in desktop
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
Loading