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

Use a new ci style for linux #15

Merged
merged 29 commits into from
Sep 13, 2024
Merged

Use a new ci style for linux #15

merged 29 commits into from
Sep 13, 2024

Conversation

sgatto
Copy link
Member

@sgatto sgatto commented Aug 28, 2024

  • if in release mode, the google/or-tools ref is extracted from the tage of the current release-tag (i.e. if we tag v9.10-rte2.0, we will use the tag v9.10 as git ref for the google/or-tools checkout)
  • LINUX: new CI style for linux, no call to python patch.py, thaks to Feature/cmake project #13, we now use cmake instead
  • WINDOWS: something does not work and we still need to use the call to python to apply the patch
  • we use find python inside cmakelist.txt because in some linux distribution only python3 is available and no python
    unfortunately some interactions of the root cmakelist with ortools cmakelists (I could not solve the issue) forces us to look for Development.Module that is useless for the patch but necessary for ortools find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Module)
  • at present the patch works only agaist the stablebranch of google/ortools, this needs to be changed quickly since the latest version of ortools renamed a file (cmake/deps.cmake-> cmake/system_deps.cmake)
  • rename the directory patchs-> cmake_patches

CMakeLists.txt Outdated Show resolved Hide resolved
Comment on lines +44 to +48
OR_REPO="https://github.com/google/or-tools.git"
TAGNAME="${{ github.event.release.tag_name }}"
TAGNAME_WITHOUT_SUFFIX=${TAGNAME%%-*}
echo "OR_REPO=$OR_REPO" >> $GITHUB_ENV
echo "OR_REF=$TAGNAME_WITHOUT_SUFFIX" >> $GITHUB_ENV
Copy link
Collaborator

Choose a reason for hiding this comment

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

you only need to do this in step "Checkout or-tools if release"

Comment on lines +46 to +50
OR_REPO="https://github.com/google/or-tools.git"
TAGNAME="${{ github.event.release.tag_name }}"
TAGNAME_WITHOUT_SUFFIX=${TAGNAME%%-*}
echo "OR_REPO=$OR_REPO" >> $GITHUB_ENV
echo "OR_REF=$TAGNAME_WITHOUT_SUFFIX" >> $GITHUB_ENV
Copy link
Collaborator

Choose a reason for hiding this comment

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

same

@sgatto sgatto merged commit 160bbcf into main Sep 13, 2024
18 of 23 checks passed
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.

2 participants