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.

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 not finding the Premake executable #10250

Merged
merged 2 commits into from Feb 28, 2022

Conversation

Enhex
Copy link
Contributor

@Enhex Enhex commented Dec 30, 2021

Changelog: Fix: Fix Premake test failing on Linux because the Premake executable isn't found.
Docs: omit

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

relevant issue: #10234

@@ -109,7 +109,13 @@
"system": {"path": {'Windows': 'C:/bazel/bin',
"Darwin": '/Users/jenkins/bin'}},
},
'premake': {},
'premake': {
Copy link
Member

Choose a reason for hiding this comment

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

This will not work in our CI once you start using premake with pytest.mark.tool_premake in any test, because our CI agents will not have premake installed. We should do:

  • Put it in the comments sections of this file, for reference
  • Move it to your own conftest_user.py so it works for you locally.
  • Add pytest.mark.tool_premake to the test
  • Keep the disabled in the conftest.py until we add it to CI
  • We will ask @davidsanfal if they can put premake5 in our CI builders, and report on the location

@memsharded memsharded added this to the 1.46 milestone Jan 23, 2022
@memsharded
Copy link
Member

Merging this, but this will fail when tests add the pytest.mark.tool("premake") mark.

@memsharded memsharded merged commit 280c772 into conan-io:develop Feb 28, 2022
memsharded added a commit to memsharded/conan that referenced this pull request Feb 28, 2022
Co-authored-by: James <james@conan.io>
memsharded added a commit that referenced this pull request Mar 1, 2022
* proposing base_source_folder, and folders.root

* Update conans/model/layout.py

Co-authored-by: Luis Martinez <lasote@gmail.com>

* [feature] `ConfDefinition` and `Conf` enhancements. (#10537)

* first approach. Big changes in Conf

* Fixing errors

* Fixing more tests

* Deleted useless iteration

* All the tests passing

* Testing

* Added items method

* fixed rebased

* Keeping old functions for backward compatibility

* backward compatibility

* Keeping indentation

* Ordering methods and improved legacy logic

* Added fixme

* Reverted breaking changes

* Added more complete test

* Added more access Conf tests

* Added docstring

* Splitted string asserts

* Added get/pop functions

* Breaking refactor. Trying new structure

* fixing tests

* Changing tests

* Fixed tests

* Fixed Python 2.x problems

* Removed useless layer of types

* Fixed py2

* Fixed errors and added cast param to apply function to convert any type

* Added TODO

* Improved docstring

* Fixed error

* Update conans/model/conf.py

Co-authored-by: James <james@conan.io>

* Update conans/model/conf.py

Co-authored-by: James <james@conan.io>

* Added check_type and removed cast

* Changed main structure. Now simpler and more powerful

* Explicit default

* Fixed error

* Simplified compile options

* Changed all the legacy conf getitem built-ins

* Fixed test

* Fixed bad type

* Added more tests

* More tests

* Fix test for Python2

* Added more tests. Fixed corner-cases

* Added one cli test and improved boolean conf UX

* Moved str conveersion

* Added one more mechanism to other smart conversion. Added more tests

* Removed useless OR

Co-authored-by: James <james@conan.io>

* [PkgConfigDeps] Added new property `component_version` (#10633)

* Added custom versions and descriptions for components

* Changed property to component_version. Backported to legacy PkgConfig

* package_folder available when "conan install" consumer (#10655)

* WIP: Test failing

* output_folder absolute only when existing

* Fix test windows

* added a few conf checkers (#10656)

* Use absolute paths in conanbuild.sh (#10653)

* use absolute path

* Update conans/test/integration/environment/test_env.py

Co-authored-by: James <james@conan.io>

* fix tests

* fix test

* fix win

* fix win

Co-authored-by: James <james@conan.io>

* Cleanup tmpdirs (#10663)

* refactor toolchain (#10665)

* fix not finding the Premake executable (#10250)

Co-authored-by: James <james@conan.io>

* review

Co-authored-by: Luis Martinez <lasote@gmail.com>
Co-authored-by: Francisco Ramírez <franchuti688@gmail.com>
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
Co-authored-by: Enhex <enhex0@gmail.com>
memsharded added a commit that referenced this pull request Mar 2, 2022
* introducing modern conan.tool.scm.Git helper

* skip Py2, change git config order

* wip

* wip

* wip

* wip

* let conandata_update create conandata.yml if not exist

* full SCM test

* adding monorepo case

* fix test

* fix test

* fix tests

* fix test

* add subfolder test

* proposing base_source_folder, and folders.root

* Update conans/model/layout.py

Co-authored-by: Luis Martinez <lasote@gmail.com>

* [feature] `ConfDefinition` and `Conf` enhancements. (#10537)

* first approach. Big changes in Conf

* Fixing errors

* Fixing more tests

* Deleted useless iteration

* All the tests passing

* Testing

* Added items method

* fixed rebased

* Keeping old functions for backward compatibility

* backward compatibility

* Keeping indentation

* Ordering methods and improved legacy logic

* Added fixme

* Reverted breaking changes

* Added more complete test

* Added more access Conf tests

* Added docstring

* Splitted string asserts

* Added get/pop functions

* Breaking refactor. Trying new structure

* fixing tests

* Changing tests

* Fixed tests

* Fixed Python 2.x problems

* Removed useless layer of types

* Fixed py2

* Fixed errors and added cast param to apply function to convert any type

* Added TODO

* Improved docstring

* Fixed error

* Update conans/model/conf.py

Co-authored-by: James <james@conan.io>

* Update conans/model/conf.py

Co-authored-by: James <james@conan.io>

* Added check_type and removed cast

* Changed main structure. Now simpler and more powerful

* Explicit default

* Fixed error

* Simplified compile options

* Changed all the legacy conf getitem built-ins

* Fixed test

* Fixed bad type

* Added more tests

* More tests

* Fix test for Python2

* Added more tests. Fixed corner-cases

* Added one cli test and improved boolean conf UX

* Moved str conveersion

* Added one more mechanism to other smart conversion. Added more tests

* Removed useless OR

Co-authored-by: James <james@conan.io>

* [PkgConfigDeps] Added new property `component_version` (#10633)

* Added custom versions and descriptions for components

* Changed property to component_version. Backported to legacy PkgConfig

* package_folder available when "conan install" consumer (#10655)

* WIP: Test failing

* output_folder absolute only when existing

* Fix test windows

* added a few conf checkers (#10656)

* Use absolute paths in conanbuild.sh (#10653)

* use absolute path

* Update conans/test/integration/environment/test_env.py

Co-authored-by: James <james@conan.io>

* fix tests

* fix test

* fix win

* fix win

Co-authored-by: James <james@conan.io>

* Cleanup tmpdirs (#10663)

* refactor toolchain (#10665)

* fix not finding the Premake executable (#10250)

Co-authored-by: James <james@conan.io>

* review

* wip

* simplified tests

* new branch test

* review

* fix test

Co-authored-by: Luis Martinez <lasote@gmail.com>
Co-authored-by: Francisco Ramírez <franchuti688@gmail.com>
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
Co-authored-by: Enhex <enhex0@gmail.com>
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.

None yet

2 participants