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

CI: tools: directly copy prebuilt tools in container #11426

Merged
merged 5 commits into from Jan 23, 2023

Conversation

Ansuel
Copy link
Member

@Ansuel Ansuel commented Dec 4, 2022

Directly copy prebuilt tools in container instead of creating an
archieve and extracting it later in other workflows.

Update build workflow to support this new implementation.

Signed-off-by: Christian Marangi ansuelsmth@gmail.com


Other changes. With AUTOREMOVE enabled if the tool is already build we skip checking if the package has been downloaded. (skipping recompile in the absence of download package)


Depends on this #11214 actually not

@Ansuel
Copy link
Member Author

Ansuel commented Dec 4, 2022

@stintel here is the thing

  • I implemented the thing to skip dl stuff with AUTOREMOVE selected
  • The copy in dockerfile

@Ansuel Ansuel force-pushed the ci-use-copy branch 3 times, most recently from 51faf6f to fe849e1 Compare December 4, 2022 23:46
@github-actions github-actions bot added build/scripts/tools pull request/issues for build, scripts and tools related changes GitHub/CI pull requests/issues for GitHub, CI and related stuff labels Dec 5, 2022
@Ansuel Ansuel force-pushed the ci-use-copy branch 2 times, most recently from 701ebd3 to 425a759 Compare January 17, 2023 23:31
Host tools path may be a symbolic link. Use -H with find to follow path
links passed from command line to find command.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
It's possible to have prebuilt tools already extracted. Add option to
just refresh the timestamps.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Packages in general use 4 check to trigger a recompile:
- timestamp for the build_dir
- timestamp for the staging stamp dir
- depends hash for the build_dir prepared file
- presence of package archieve in dl

If host tools are prebuilt and shipped in a container or manually
installed from an archieve, it would be ideal to skip including the
package archieve and just provide the build_dir prepared files and the
staging stamp file (and the actualy prebuilt tools).

Add some logic to skip dl download for host tools if AUTOREMOVE is
selected and checks for the presence of staging dir stamp file and build
dir stamp file.

If one of these requirements are not met, the package is redownloaded
and rebuilt.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
We can now drop the dl dir in the prebuilt tools tar as package archieve
is not a requirement anymore and won't trigger a package recompile.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Directly copy prebuilt tools in container instead of creating an
archieve and extracting it later in other workflows.

Update build workflow to support this new implementation.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
@openwrt-bot openwrt-bot merged commit d40f598 into openwrt:master Jan 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build/scripts/tools pull request/issues for build, scripts and tools related changes GitHub/CI pull requests/issues for GitHub, CI and related stuff
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants