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

Update to upstream version of that buildpack #35

Merged
merged 26 commits into from
Oct 25, 2022
Merged

Conversation

johnsudaar
Copy link

7166074 Jonathan Hurter - Merge remote-tracking branch 'upstream/main' into update/upstream
1379026 Ed Morley - Reduce Dependabot frequency to monthly (heroku#249)
33775a0 Manuel Fuchs - OpenJDK Q4 2022 updates (heroku#250)
9cfa732 Manuel Fuchs - Add OpenJDK 19, 18.0.2.1 (heroku#247)
851fe05 dependabot[bot] - Bump rspec-expectations from 3.11.0 to 3.11.1 (heroku#246)
2e337ba Manuel Fuchs - Add OpenJDK August 2022 PSU's (heroku#245)
dd43bef Doris Kwan - Update default OpenJDK versions (heroku#244)
942d920 Manuel Fuchs - Only use --retry-connrefused on Ubuntu based stacks (heroku#243)
2412c2c Ed Morley - Release v134 (heroku#242)
e057e12 Ed Morley - Adjust curl retry and connection timeout handling (heroku#241)
524a2e9 Ed Morley - Switch to the recommended regional S3 domain (heroku#240)
25840a5 Manuel Fuchs - Add support for distribution prefixes with non-patch release versions (heroku#239)
624283f Manuel Fuchs - Prepare CHANGELOG for release (heroku#238)
ad683f3 Manuel Fuchs - Heroku-22 (heroku#236)
f0ccd7d Manuel Fuchs - Refactor OpenJDK version resolution (heroku#237)
40fb113 Manuel Fuchs - Remove CNB support (heroku#235)
42ee1f6 Ed Morley - Remove CNB release workflow from Circle CI config (heroku#233)
2857976 Manuel Fuchs - Update default OpenJDK 18 version (heroku#234)
c44d0b7 Manuel Fuchs - Update default OpenJDK versions (heroku#232)
01bac9e Manuel Fuchs - Add OpenJDK 18 support (heroku#230)
6e7c223 Manuel Fuchs - Upgrade default JDK for Java 11 to 11.0.14.1 (heroku#229)
4662f3d dependabot[bot] - Bump rspec-expectations from 3.10.2 to 3.11.0 (heroku#228)
e711653 Manuel Fuchs - Update default OpenJDK versions (heroku#226)
b10fde7 dependabot[bot] - Bump rspec-expectations from 3.10.1 to 3.10.2 (heroku#225)
a886180 Doris Kwan - Upgrade default OpenJDK version 7u322 (heroku#223)
1832b38 Doris Kwan - Update default version of OpenJDK 17 (heroku#222)

doriskwan and others added 26 commits October 27, 2021 11:34
* Upgrade default OpenJDK version 7u322

* Apply suggestions from code review

Co-authored-by: Ed Morley <[email protected]>
Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.10.1 to 3.10.2.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md)
- [Commits](rspec/rspec-expectations@v3.10.1...v3.10.2)

---
updated-dependencies:
- dependency-name: rspec-expectations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.10.2 to 3.11.0.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md)
- [Commits](rspec/rspec-expectations@v3.10.2...v3.11.0)

---
updated-dependencies:
- dependency-name: rspec-expectations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update default OpenJDK versions

* Exclude OpenJDK 18.0.1

18.0.1 is not out yet, to not further delay the updates, we'll do a subsequent release for OpenJDK 18.0.1
later.
Since:
- CNBs are no longer released from this repo.
- The `GITHUB_TOKEN` env var has been removed from the Circle CI project
   settings, since the token it contains has been invalidated.

GUS-W-11040282.
* Remove CNB support

Heroku Java CNBs are now located here: https://github.com/heroku/buildpacks-jvm

* Update CHANGELOG for release
* Add support for heroku-22

* Install Azul Zulu on heroku-22

* Adjust tests for heroku-22

* Update CHANGELOG
…heroku#239)

* Add support for distribution prefixes with non-patch release versions

* Update CHANGELOG

* Improve output when using heroku distribution prefix
Whilst the global S3 endpoint (`s3.amazonaws.com`) still works,
AWS now recommends using the appropriate regional endpoint
to access the bucket:
https://docs.aws.amazon.com/AmazonS3/latest/userguide/VirtualHosting.html#s3-legacy-endpoints

Our buildpack buckets are in `us-east-1`, whose regional domain
is `*.s3.us-east-1.amazonaws.com`:
https://docs.aws.amazon.com/general/latest/gr/s3.html#s3_region

GUS-W-11283397.
In the shimmed CNBs used in `heroku/builder` we have been seeing
quite a few transient errors related to buildpacks downloading from S3.

Adding appropriate retries and connection timeouts to all of our
buildpack's curl usages should help with these, as well as make builds
more reliable in general for users on Heroku, plus also anyone using a
shimmed CNB locally with Pack CLI (where the network connection may
be even less reliable).

The `--retry-connrefused` option has been used since otherwise curl
doesn't retry cases where the connection was refused. Ideally we would
use `--retry-all-errors` which takes that one step further, however that
option was only added in curl 7.71, so is only supported by Heroku-22+.

For more on curl options, see:
https://curl.se/docs/manpage.html

GUS-W-11283397.
To pick up heroku#240 & heroku#241.

GUS-W-11283397.
* Add curl_with_defaults

This layer of indirection allows us to conditionally set some default curl arguments.

* Source bin/util in testrunner tests

* Patch buildpack-testrunner to use bash for shunit2

* Update CHANGELOG

* Use curl help instead of uname to determine available curl features
* Update default OpenJDK versions

* Update default OpenJDK versions Q3 2022
* Add OpenJDK August 2022 PSU's

* Update CHANGELOG
Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/main/Changelog.md)
- [Commits](rspec/rspec-expectations@v3.11.0...v3.11.1)

---
updated-dependencies:
- dependency-name: rspec-expectations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
To reduce the churn + email notification noise slightly. GitHub will still open
PRs for any security issues outside of the monthly cadence.
@johnsudaar johnsudaar requested a review from EtienneM October 25, 2022 10:04
Copy link
Member

@EtienneM EtienneM left a comment

Choose a reason for hiding this comment

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

Did you follow our internal procedure about this upgrade and made sure it works? If yes, LGTM

@johnsudaar johnsudaar merged commit 6017849 into master Oct 25, 2022
@johnsudaar johnsudaar deleted the update/upstream branch October 25, 2022 13:51
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.

6 participants