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

Clean even more thoroughly #184

Merged
merged 1 commit into from
Sep 14, 2023
Merged

Clean even more thoroughly #184

merged 1 commit into from
Sep 14, 2023

Conversation

dbnicholson
Copy link
Member

@dbnicholson dbnicholson commented Sep 13, 2023

A recent Jenkins build included the wrong version of collections.zip because the one in the workspace was newer than the requested version. Let's try to fix this for real by making the make clean target actually clean everything except for the p4a builds and the downloaded Kolibri wheel file. I checked the results with git ls-files -o --directory after a local build and think I got everything.

With that, make clean can be run at the beginning of the Jenkins build (in addition to the existing p4a clean-builds) and we can be reasonable sure that it will DTRT. The reason not to just wipe the workspace outright is that we want to keep the _cache directory for the p4a downloads.

One subtle difference is that the src/kolibri target was previously depending on clean. Previously that was just cleaning up the dist artifacts, but with the more thorough clean recipe, that would break everything. Instead, the dist targets clean old artifacts as needed.

Fixes: #806

A recent Jenkins build included the wrong version of `collections.zip`
because the one in the workspace was newer than the requested version.
Let's try to fix this for real by making the `make clean` target
actually clean everything except for the p4a builds and the downloaded
Kolibri wheel file. I checked the results with `git ls-files -o
--directory` after a local build and think I got everything.

With that, `make clean` can be run at the beginning of the Jenkins build
(in addition to the existing `p4a clean-builds`) and we can be
reasonable sure that it will DTRT. The reason not to just wipe the
workspace outright is that we want to keep the `_cache` directory for
the p4a downloads.

One subtle difference is that the `src/kolibri` target was previously
depending on `clean`. Previously that was just cleaning up the `dist`
artifacts, but with the more thorough `clean` recipe, that would break
everything. Instead, the `dist` targets clean old artifacts as needed.

Fixes: endlessm/kolibri-explore-plugin#806
Copy link

@starnight starnight left a comment

Choose a reason for hiding this comment

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

LGTM!

@starnight starnight merged commit 8294cd0 into develop Sep 14, 2023
@starnight starnight deleted the 806-more-cleaning branch September 14, 2023 10:55
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.

Download is not in progress and a white screen is displayed instead
2 participants