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.

Sign up for GitHub

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

Jump to bottom

Remove cutlass integration tests #674

Merged
merged 3 commits into from
Oct 4, 2023
Merged

Remove cutlass integration tests #674

merged 3 commits into from
Oct 4, 2023

Conversation

colincasey
Copy link
Contributor

All equivalent checks that were done in the cutlass tests have been moved into the Rust integration tests which use the composite buildpacks to execute.

@colincasey
Remove cutlass integration tests
39aa001 
All equivalent checks that were done in the cutlass tests have been moved into the Rust integration tests which use the composite buildpacks to execute.
@colincasey colincasey requested a review from a team as a code owner October 3, 2023 16:18
@colincasey colincasey self-assigned this Oct 3, 2023
@colincasey
Copy link
Contributor Author

TODO: remove cutlass tests from required validations

schneems
schneems reviewed Oct 3, 2023
View reviewed changes
Copy link
Contributor

@schneems schneems left a comment

Choose a reason for hiding this comment

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

I checked the individual tests were ported over. All but the node version ones were. Code comments on the retry helper relate more to #663, but I think are still relevant here.

@colincasey colincasey requested a review from schneems October 3, 2023 18:09
schneems
schneems approved these changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@schneems schneems left a comment

Choose a reason for hiding this comment

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

The current changes look good. One failing test due to ci.yml still referencing cutlass. Other than that :shipit:

schneems
schneems reviewed Oct 3, 2023
View reviewed changes
test_support/src/lib.rs Outdated Show resolved Hide resolved
@colincasey colincasey enabled auto-merge (squash) October 4, 2023 12:40
@colincasey colincasey merged commit 84c4cb8 into main Oct 4, 2023
17 of 19 checks passed
@colincasey colincasey deleted the remove_cutlass_tests branch October 4, 2023 12:57
@edmorley
Copy link
Member

edmorley commented Oct 4, 2023

@colincasey This was merged with a failing CI job, since the CI workflow wasn't updated:
https://github.com/heroku/buildpacks-nodejs/actions/runs/6406325700/job/17390700600

Richard mentioned this in his review:
#674 (review)

colincasey added a commit that referenced this pull request Oct 4, 2023
@colincasey
Remove cutlass job from CI
829b4e2 
Forgot to remove this with #674.
@colincasey colincasey mentioned this pull request Oct 4, 2023
Merged
colincasey added a commit that referenced this pull request Oct 4, 2023
@colincasey
Remove cutlass job from CI (#675)
f27ea3d 
Forgot to remove this with #674.
colincasey added a commit that referenced this pull request Oct 4, 2023
@colincasey
Merge branch 'main' into system_npm
0bc86e8 
* main: (48 commits)
  Remove cutlass job from CI (#675)
  Update Inventory for heroku/nodejs-npm-engine (#624)
  Remove cutlass integration tests (#674)
  Update Inventory for heroku/nodejs-engine (#671)
  Update Inventory for heroku/nodejs-yarn (#670)
  Prepare integration tests to run under a single builder (#663)
  Bump Swatinem/rust-cache from 2.6.2 to 2.7.0 (#665)
  Bump actions/checkout from 3 to 4 (#664)
  Bump regex from 1.9.5 to 1.9.6 (#666)
  Bump thiserror from 1.0.48 to 1.0.49 (#667)
  Bump ureq from 2.7.1 to 2.8.0 (#668)
  Bump serde_json from 1.0.105 to 1.0.107 (#669)
  Fix CNB builder repo URL (#672)
  Fix non-existent builder Docker image name (#673)
  Updates `libcnb` to 0.15.0 (#662)
  Switch tests from `heroku/buildpacks:20` to `heroku/builder:20` (#660)
  Prepare release v1.1.6 (#658)
  Bump regex from 1.9.4 to 1.9.5 (#656)
  Bump indoc from 2.0.3 to 2.0.4 (#657)
  Bump toml from 0.7.6 to 0.7.8 (#654)
  ...

# Conflicts:
#	buildpacks/nodejs-engine/CHANGELOG.md
colincasey added a commit that referenced this pull request Oct 4, 2023
@colincasey
Merge branch 'main' into npm-buildpacks/nodejs-npm-engine
fd61c9f 
* main: (31 commits)
  Add `npm` to `nodejs-engine` build plan (#622)
  Remove cutlass job from CI (#675)
  Update Inventory for heroku/nodejs-npm-engine (#624)
  Remove cutlass integration tests (#674)
  Update Inventory for heroku/nodejs-engine (#671)
  Update Inventory for heroku/nodejs-yarn (#670)
  Prepare integration tests to run under a single builder (#663)
  Bump Swatinem/rust-cache from 2.6.2 to 2.7.0 (#665)
  Bump actions/checkout from 3 to 4 (#664)
  Bump regex from 1.9.5 to 1.9.6 (#666)
  Bump thiserror from 1.0.48 to 1.0.49 (#667)
  Bump ureq from 2.7.1 to 2.8.0 (#668)
  Bump serde_json from 1.0.105 to 1.0.107 (#669)
  Fix CNB builder repo URL (#672)
  Fix non-existent builder Docker image name (#673)
  Updates `libcnb` to 0.15.0 (#662)
  Switch tests from `heroku/buildpacks:20` to `heroku/builder:20` (#660)
  Prepare release v1.1.6 (#658)
  Bump regex from 1.9.4 to 1.9.5 (#656)
  Bump indoc from 2.0.3 to 2.0.4 (#657)
  ...

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	buildpacks/nodejs-npm-engine/CHANGELOG.md
#	test_support/Cargo.toml
#	test_support/src/lib.rs
colincasey added a commit that referenced this pull request Oct 4, 2023
@colincasey
Merge branch 'main' into npm-buildpacks/nodejs-npm-install
27473cf 
* main: (31 commits)
  Add `npm` to `nodejs-engine` build plan (#622)
  Remove cutlass job from CI (#675)
  Update Inventory for heroku/nodejs-npm-engine (#624)
  Remove cutlass integration tests (#674)
  Update Inventory for heroku/nodejs-engine (#671)
  Update Inventory for heroku/nodejs-yarn (#670)
  Prepare integration tests to run under a single builder (#663)
  Bump Swatinem/rust-cache from 2.6.2 to 2.7.0 (#665)
  Bump actions/checkout from 3 to 4 (#664)
  Bump regex from 1.9.5 to 1.9.6 (#666)
  Bump thiserror from 1.0.48 to 1.0.49 (#667)
  Bump ureq from 2.7.1 to 2.8.0 (#668)
  Bump serde_json from 1.0.105 to 1.0.107 (#669)
  Fix CNB builder repo URL (#672)
  Fix non-existent builder Docker image name (#673)
  Updates `libcnb` to 0.15.0 (#662)
  Switch tests from `heroku/buildpacks:20` to `heroku/builder:20` (#660)
  Prepare release v1.1.6 (#658)
  Bump regex from 1.9.4 to 1.9.5 (#656)
  Bump indoc from 2.0.3 to 2.0.4 (#657)
  ...

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	meta-buildpacks/nodejs/buildpack.toml
#	test_support/Cargo.toml
#	test_support/src/lib.rs
@edmorley edmorley mentioned this pull request Oct 9, 2023
Merged
edmorley added a commit that referenced this pull request Oct 9, 2023
@edmorley
Group minor/patch version Rust Dependabot updates into one PR (#679)
9825ca7 
Previously only libcnb related dependency updates were grouped into
one Dependabot PR.

Now there is a second group, that takes advantage of Dependabot's new
semver version level grouping feature:
https://github.blog/changelog/2023-08-17-grouped-version-updates-by-semantic-version-level-for-dependabot/

In addition, the check changelog skipping strategy has been updated to
use the explicit `skip changelog` label for (a) explicitness, (b) to
allow removing the label in situations where we realise a changelog
entry is required (eg libcnb buildpack API version bumps), (c) for
consistency with other repos.

Lastly, the redundant `bundler` entry in the Dependabot config has
been removed (a leftover from #674).

GUS-W-14258249.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@schneems schneems schneems approved these changes

Assignees

@colincasey colincasey

Labels
skip changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@colincasey @edmorley @schneems