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

[BUG] contributor: npm install not always run after PULL #1447

Closed
2 tasks done
JoernBerkefeld opened this issue Jul 15, 2024 · 4 comments · Fixed by #1450, #1428 or #1468
Closed
2 tasks done

[BUG] contributor: npm install not always run after PULL #1447

JoernBerkefeld opened this issue Jul 15, 2024 · 4 comments · Fixed by #1450, #1428 or #1468
Assignees
@JoernBerkefeld
Labels
bug Something isn't working contributor improvements for contributing to mcdev
Milestone
7.1.0

Comments

@JoernBerkefeld
Copy link
Contributor

Is there an existing issue for this?

  • I have searched the existing issues

Current Behavior

it compares the latest commit with the commit before that - but on pull this might include more than one commit

now: HEAD^1 HEAD

Expected Behavior

we should be using the same logic that is used in post-checkout

then $NEWHEAD $OLDHEAD or $1 $2 respectively

Steps To Reproduce

  1. work on feature branch.
  2. make a commit changing package-lock.json
  3. make 1..n additional commits to that feature branch
  4. merge feature branch into develop branch
  5. switch to develop branch
  6. pull

it will not execute npm install because it only compares the last 2 commits with each other, where the last one is the merge commit and the one before that is the latest commit to the feature branch

Version

7.0.4

Environment

  • OS:
  • Node:
  • npm:

Participation

  • I am willing to submit a pull request for this issue.

Additional comments

No response
@JoernBerkefeld JoernBerkefeld added bug Something isn't working contributor improvements for contributing to mcdev labels Jul 15, 2024
@JoernBerkefeld JoernBerkefeld added this to the 7.1.0 milestone Jul 15, 2024
@JoernBerkefeld JoernBerkefeld self-assigned this Jul 15, 2024
JoernBerkefeld added a commit that referenced this issue Jul 15, 2024
@JoernBerkefeld
#1447: replace "HEAD^1 HEAD" with "$1 $2" to ensure this triggers npm…
95d2f89 
… i if multiple commits will be downloaded by PULL
@JoernBerkefeld JoernBerkefeld mentioned this issue Jul 15, 2024
Merged
4 tasks
@JoernBerkefeld JoernBerkefeld linked a pull request Jul 15, 2024 that will close this issue
Task/1447 replace "HEAD^1 HEAD" with "$1 $2" to ensure this triggers npm install if multiple commits will be downloaded by PULL #1450
Merged
4 tasks
@github-actions GitHub Actions
Copy link

Closed by #1450.

@JoernBerkefeld
Copy link
Contributor Author

didnt work:
image

@JoernBerkefeld
Copy link
Contributor Author

maybe we can store the previous HEAD's hash key in an environment variable and retrieve that during post-merge?

@JoernBerkefeld JoernBerkefeld mentioned this issue Jul 18, 2024
Merged
11 tasks
JoernBerkefeld added a commit that referenced this issue Jul 18, 2024
@JoernBerkefeld
#1447: attempt at fixing post-merge for when we checkout a branch and…
481451b 
… pull afterwards
JoernBerkefeld added a commit that referenced this issue Jul 18, 2024
@JoernBerkefeld
#1447: reversing commits in post-checkout assuming that the order was…
a7e7ea1 
… actually incorrect
JoernBerkefeld added a commit that referenced this issue Jul 18, 2024
@JoernBerkefeld
#1447: cleanup
ace4982
@JoernBerkefeld JoernBerkefeld mentioned this issue Jul 18, 2024
Merged
4 tasks
@github-actions GitHub Actions
Copy link

Closed by #1468.

@JoernBerkefeld JoernBerkefeld linked a pull request Jul 18, 2024 that will close this issue
Bug/1447 contributor npm install not always run after pull #1468
Merged
4 tasks
JoernBerkefeld added a commit that referenced this issue Jul 18, 2024
@JoernBerkefeld
#1447: cleanup
e650e8d
JoernBerkefeld added a commit that referenced this issue Jul 22, 2024
@JoernBerkefeld
#1447: debug merge-hook
087e58a
JoernBerkefeld added a commit that referenced this issue Jul 22, 2024
@JoernBerkefeld
#1447: new attempt at getting proper package-lock test
c09d22c
JoernBerkefeld added a commit that referenced this issue Jul 22, 2024
@JoernBerkefeld
#1447: cleanup
098a1bd
JoernBerkefeld added a commit that referenced this issue Jul 23, 2024
@JoernBerkefeld
#1447: test what variables are passed in
694ebd4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@JoernBerkefeld JoernBerkefeld

Labels
bug Something isn't working contributor improvements for contributing to mcdev
Projects
None yet
Milestone
7.1.0
1 participant
@JoernBerkefeld