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

Merge upstream #5

Merged
merged 21 commits into from
Aug 23, 2024
Merged

Merge upstream #5

merged 21 commits into from
Aug 23, 2024

Conversation

jas14
Copy link
Collaborator

@jas14 jas14 commented Aug 23, 2024

No description provided.

edmorley and others added 20 commits January 16, 2024 12:55
* Fix variable quoting throughout

Guards against glob expansion from user input, and works with spaces etc in any path names.

Double square brackets do not technically need quoting, but doing it for consistency, as the lines have been touched anyway.

Variable assignments, on the other hand, do not require quoting, but I did not remove existing quotes to aid future 'git blame's.

* Fix .deb globbing

Iterating over 'ls' output breaks with spaces in path names

* Use nul byte separators with find/xargs

Guards against spaces etc in path/file names
…le line (heroku#112)

* Handle when multiple packages are declared on a single line.
* Update CHANGELOG.md

---------

Co-authored-by: Rune Soerensen <[email protected]>
Now:
- If the stack version file is missing, we don't assume the cached files
  belong to the current stack (since that could cause breakage), and
  instead invalidate the cache. (The cache actually offers little benefit
  in practice for this buildpack, so invalidating is cheap.)
- The whole `${CACHE_DIR}/apt` directory is removed rather than
  only the `${CACHE_DIR}/apt/cache` directory. This ensures the APT
  indexes and other files from old stack versions are cleaned up too.
- Some build output logs have been adjusted to be more accurate.
- A test has been added for cache re-use, since it wasn't previously
  tested.

These papercuts were noticed whilst working on:
heroku/heroku-buildpack-chrome-for-testing#21
Since this repo uses GitHub Actions for CI instead.
With a `[publish.Ignore]` table, to exclude unnecessary files from the
buildpack archive published to the buildpack registry.
@jas14 jas14 requested a review from jhottenstein August 23, 2024 20:06
Copy link

@rofreg rofreg left a comment

Choose a reason for hiding this comment

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

Looks good barring CI issues.

@jas14 jas14 merged commit 81e2964 into master Aug 23, 2024
5 checks passed
@jas14 jas14 deleted the joe/merge-upstream branch August 23, 2024 20: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.

5 participants