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

chore: Update CMAKE to 3.22.1 for gitlab builds. #221

Merged
merged 1 commit into from
Feb 12, 2024

Conversation

fuzzybinary
Copy link
Member

What does this PR do?

Some plugin builds are failing because we're missing CMAKE 3.22.1. Update the Dockerfile so that CMAKE 3.22.1 is always installed.

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Make sure you discussed the feature or bugfix with the maintaining team in an Issue
  • Make sure each commit and the PR mention the Issue number (cf the CONTRIBUTING doc)

@fuzzybinary fuzzybinary marked this pull request as ready for review February 9, 2024 19:50
@fuzzybinary fuzzybinary requested review from a team as code owners February 9, 2024 19:50
@codecov-commenter
Copy link

codecov-commenter commented Feb 9, 2024

Codecov Report

Merging #221 (8c2a5a3) into develop (5895876) will increase coverage by 0.15%.
The diff coverage is n/a.

❗ Current head 8c2a5a3 differs from pull request most recent head 5bc4c97. Consider uploading reports for the commit 5bc4c97 to get more accurate results

Additional details and impacted files
@@              Coverage Diff              @@
##             develop     #221      +/-   ##
=============================================
+ Coverage      78.05%   78.20%   +0.15%     
- Complexity       186      187       +1     
=============================================
  Files             22       22              
  Lines            665      665              
  Branches          85       85              
=============================================
+ Hits             519      520       +1     
  Misses           116      116              
+ Partials          30       29       -1     

see 1 file with indirect coverage changes

0xnm
0xnm previously approved these changes Feb 12, 2024
@@ -29,7 +29,7 @@ ENV ANDROID_COMPILE_SDK 34
ENV ANDROID_BUILD_TOOLS 34.0.0
ENV ANDROID_SDK_TOOLS 10406996
ENV NDK_VERSION 21.3.6528147
ENV CMAKE_VERSION 3.10.2.4988404
ENV CMAKE_VERSION 3.22.1
Copy link
Member

Choose a reason for hiding this comment

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

you probably want also to bump image version in .gitlab-ci.yml, so that it is deployed and used.

Copy link
Member Author

Choose a reason for hiding this comment

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

Is that just changing this line from 6 to 7? Do I have to do anything else?

Copy link
Member

Choose a reason for hiding this comment

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

yes, you need to change this line and then run image generation job (ci-image) manually

@fuzzybinary fuzzybinary merged commit 105e129 into develop Feb 12, 2024
12 checks passed
@fuzzybinary fuzzybinary deleted the jward/cmake-update branch February 12, 2024 15:17
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.

3 participants