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 MacOS compatibility script syntax #4459

Merged
merged 1 commit into from
Mar 21, 2024

Conversation

pchila
Copy link
Member

@pchila pchila commented Mar 21, 2024

What does this PR do?

Fix syntax in compatibility script for MacOS originally introduced in #1392 and modified for #4193. Modification introduced in #4193 contains a syntax error that this PR fixes

Why is it important?

Upgrade from elastic-agent < 8.5.0 needs this script to correct the target for link /Library/Elastic/Agent/elastic-agent to the actual elastic-agent binary

Checklist

  • My code follows the style guidelines of this project
  • [ ] I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • [ ] I have added tests that prove my fix is effective or that my feature works
  • [ ] I have added an entry in ./changelog/fragments using the changelog tool
  • [ ] I have added an integration test or an E2E test

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

@pchila pchila added bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team Team:Elastic-Agent Label for the Agent team labels Mar 21, 2024
@pchila pchila self-assigned this Mar 21, 2024
Copy link
Contributor

mergify bot commented Mar 21, 2024

This pull request does not have a backport label. Could you fix it @pchila? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 8./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@pchila pchila added skip-changelog backport-v8.13.0 Automated backport with mergify and removed backport-skip labels Mar 21, 2024
@cmacknz cmacknz added backport-skip backport-v8.13.0 Automated backport with mergify and removed backport-v8.13.0 Automated backport with mergify labels Mar 21, 2024
@mergify mergify bot removed the backport-skip label Mar 21, 2024
@cmacknz cmacknz changed the base branch from main to 8.13 March 21, 2024 18:14
@cmacknz cmacknz changed the base branch from 8.13 to main March 21, 2024 18:14
@cmacknz cmacknz added the backport-v8.13.0 Automated backport with mergify label Mar 21, 2024
@pchila pchila marked this pull request as ready for review March 21, 2024 18:49
@pchila pchila requested a review from a team as a code owner March 21, 2024 18:49
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@cmacknz
Copy link
Member

cmacknz commented Mar 21, 2024

Upgrade of 7.17.18 to 8.14.0-SNAPSHOT from this branch succeeded for me with a manual test.

@cmacknz
Copy link
Member

cmacknz commented Mar 21, 2024

Force merging, integration tests remaining do not run on MacOS.

@cmacknz cmacknz merged commit 08bd15e into elastic:main Mar 21, 2024
14 of 20 checks passed
Copy link

Quality Gate passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No Coverage information No data about Coverage
No Duplication information No data about Duplication

See analysis details on SonarQube

mergify bot pushed a commit that referenced this pull request Mar 21, 2024
cmacknz pushed a commit that referenced this pull request Mar 21, 2024
(cherry picked from commit 08bd15e)

Co-authored-by: Paolo Chilà <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v8.13.0 Automated backport with mergify bug Something isn't working skip-changelog Team:Elastic-Agent Label for the Agent team Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrading from <8.5.0 to 8.13.0 fails on MacOS
3 participants