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 IDF tool installation #2861

Merged
merged 3 commits into from
Jul 15, 2024
Merged

Conversation

mikee47
Copy link
Contributor

@mikee47 mikee47 commented Jul 15, 2024

This PR fixes tool installation for IDF < 5.2.

Overlooked that wildcard tool spec. only supported for IDF 5.2 installer.
Fixed by providing explicit list of tools for each version.

Improve cache-clean action

Not very intuitive so added four levels of cleaning:

  • pull-requests: Any items created by pull requests, excludes anything in develop branch
  • ccache: All ccache items
  • idf-tools: All IDF tools
  • ccache+idf: All ccache and IDF tool caches.

Removed the cache-rebuild action since we can just do a cache clean then manually trigger a rebuild of the develop branch to accomplish a similar thing.

Update clean-tools.py script

Didn't clean some tools.

mikee47 added 3 commits July 15, 2024 12:57
Double-typed 'install', and wildcard tool spec. only supported for IDF 5.2
Just provide explicit list of tools for each version
Since we're not attempting a reinstall in CI can just remove entire tree
Select level of cleaning required
Rebuild happens in due course, no need for a specific action.
@mikee47
Copy link
Contributor Author

mikee47 commented Jul 15, 2024

I cleaned the appropriate IDF caches before creating this PR so will actually run the install scripts to verify.

@slaff slaff added this to the 5.2.0 milestone Jul 15, 2024
# Be specific about which tools we want to install for each IDF version
IDF_TOOL_PACKAGES=$(tr '\n' ' ' < "$SMING_HOME/Arch/Esp32/Tools/idf_tools-${INSTALL_IDF_VER}.lst")
echo "Install: $IDF_TOOL_PACKAGES"
python3 "$IDF_PATH/tools/idf_tools.py" --non-interactive install $IDF_TOOL_PACKAGES
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Codacy persistently complains when variables such as $IDF_TOOL_PACKETS are used without quotes. I'm not clear on the best way to shut it up, but this usage is intended.

Copy link
Contributor

Choose a reason for hiding this comment

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

clear on the best way to shut it up, but this usage is intended.

I will do it. Basically you need to click on "Ignore issue" for this file.

Copy link
Contributor

Choose a reason for hiding this comment

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

Done.

@slaff
Copy link
Contributor

slaff commented Jul 15, 2024

@mikee47 do you have something else to add to this PR?

@mikee47
Copy link
Contributor Author

mikee47 commented Jul 15, 2024

@slaff Nope, all done until something else breaks :-)

@mikee47
Copy link
Contributor Author

mikee47 commented Jul 15, 2024

I've wiped all the caches so this gets a proper run when it's merged

@slaff slaff merged commit 90cb6bb into SmingHub:develop Jul 15, 2024
45 of 46 checks passed
@mikee47 mikee47 deleted the dev/fix-idf-install branch July 17, 2024 11:23
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