Skip to content

add workaround refs changed files#599

Closed
mr-tz wants to merge 1 commit intomasterfrom
ci/fix-changelog-changed-files
Closed

add workaround refs changed files#599
mr-tz wants to merge 1 commit intomasterfrom
ci/fix-changelog-changed-files

Conversation

@mr-tz
Copy link
Collaborator

@mr-tz mr-tz commented May 31, 2021

similar to the workaround in capa-rules

for instance observed in #598

Checklist

  • No CHANGELOG update needed
  • No new tests needed
  • No documentation update needed

@mr-tz mr-tz requested a review from Ana06 May 31, 2021 10:29
@mr-tz
Copy link
Collaborator Author

mr-tz commented Jun 2, 2021

ping @Ana06

# this Action may throw the below error, e.g. when not properly rebased
# however, it still gets the modified files and we can continue
# Error: The head commit for this pull_request_target event is not ahead of the base commit.
continue-on-error: true
Copy link
Member

Choose a reason for hiding this comment

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

I think we should approach this differently, as this could hide other relevant errors. This check can be easily removed in the action (there is even a PR upstream, as jitterbit/get-changed-files@v1 behaves the same: jitterbit/get-changed-files#25). I personally try to rebase branches often (to avoid errors because not testing my changes with the latest code) and find this failure a nice reminder that I have to rebase. But as you said, it is not needed for the action to work. So, I can chery-pick the change in jitterbit/get-changed-files#25 and release Ana06/get-changed-files@v1.2.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

great if they fix it upstream, the arguments in the linked issue make sense. if the fix is ready soon I'm fine with that otherwise we can use this workaround to ease our development

Copy link
Member

Choose a reason for hiding this comment

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

I don't know if it will make it upstream. The reason why I released my own version is because the project didn't seem to be maintained. I have released Ana06/get-changed-files@v1.2 which includes the fix. We are already using a fork of upstream, so let use my new version and change it to upstream if they release a version which include the same fixes.

Ana06 added a commit to Ana06/capa that referenced this pull request Jun 4, 2021
Use Ana06/get-changed-files@v1.2 which removes the _head commit is ahead
of the base commit_ check. This made the action failed in not up-to-date
branches (in which rebasing is needed).

It supersedes mandiant#599
@Ana06 Ana06 mentioned this pull request Jun 4, 2021
3 tasks
@mr-tz mr-tz closed this Jun 4, 2021
@mr-tz mr-tz deleted the ci/fix-changelog-changed-files branch September 10, 2021 13:34
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.

2 participants