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

Sync with upstream v9 #11

Merged
merged 25 commits into from
May 13, 2024
Merged

Sync with upstream v9 #11

merged 25 commits into from
May 13, 2024

Conversation

Frzk
Copy link

@Frzk Frzk commented May 2, 2024

@Frzk Frzk self-assigned this May 2, 2024
@Frzk Frzk marked this pull request as ready for review May 2, 2024 14:48
@Frzk Frzk requested a review from EtienneM May 2, 2024 14:48
@Frzk Frzk enabled auto-merge May 3, 2024 13:51
@Frzk Frzk force-pushed the deps/upstream_v9 branch from 6fb83c1 to b0f0477 Compare May 13, 2024 08:06
@Frzk Frzk disabled auto-merge May 13, 2024 08:07
@Frzk Frzk enabled auto-merge May 13, 2024 08:12
KevinBrolly and others added 22 commits May 13, 2024 10:39
Since for the check changelog check (added in heroku#56) to pass,
we actually need a changelog to which we can add entries.

I've backfilled recent changes based on the Git history.

The buildpack doesn't tag versions, so I've used dates only.

Closes W-8726144.
Enables the bash `pipefail` mode, which ensures that a failure in a
command prior to a pipe correctly causes the script to exit 1.

Without this, failures during the `apt-get` and `curl` invocations were
ignored and the compile marked as a success. At best this leads to
confusing errors in later buildpacks (if build time dependencies are
missing), and at worst this could cause runtime failures for packages
not used during the build, but required by the app at runtime.

Enabling `pipefail` mode required a change to the custom repositories
feature, to prevent the build exiting 1 when `grep -s -e "^:repo:"`
found no matches (ie when no custom repositories are specified).

In addition, the `--show-error` and `--fail` flags have been added to
the `curl` call, otherwise non-HTTP 200 exit codes are ignored and the
compile similarly marked as successful when it should not have been.

Fixes heroku#47.
Fixes W-8722791.
In a recent support ticket, a user had copied the example `:repo:` line into their `Aptfile`,
which previously referred to the now obsolete "artful" Ubuntu LTS release.

This caused the build to fail after heroku#79, when previously the error was ignored.

This PR makes the example more clearly just an example, and emphasises that
using a custom repository is only necessary if using packages from outside
the standard Ubuntu repository.

In addition, the bogus `pg` Gem example was removed, since `libpq-dev` is
part of the stack image, so we should not be encouraging people to install
it unnecessarily.
The error message is output to `stderr` otherwise it won't be shown.

Closes GUS-W-8799411.
Refs heroku#86.
* 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]>
@Frzk Frzk force-pushed the deps/upstream_v9 branch from b0f0477 to de0d147 Compare May 13, 2024 09:03
@Frzk Frzk merged commit 990bc7c into master May 13, 2024
1 of 5 checks passed
@Frzk Frzk deleted the deps/upstream_v9 branch May 13, 2024 09:03
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.

Sync with upstream v9
6 participants