Skip to content

Fix CI failure of PR #1989 - #1990

Closed
jcfstabile wants to merge 1 commit into
Guake:masterfrom
jcfstabile:fix/gi-not-found-on-run-local
Closed

Fix CI failure of PR #1989#1990
jcfstabile wants to merge 1 commit into
Guake:masterfrom
jcfstabile:fix/gi-not-found-on-run-local

Conversation

@jcfstabile

Copy link
Copy Markdown
Contributor

Downgrade pipenv to 2021.5.29

@mlouielu mlouielu left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Your local branch should rebase with Guake/master. The git commits are not clean.

@mlouielu mlouielu left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I believe commits still have problem, we should only get one commit log in this case.

The easiest way may be copy the hash (cf94936), reset to latest main hash, then cherry-pick the copied hash back.

@jcfstabile

jcfstabile commented Dec 16, 2021

Copy link
Copy Markdown
Contributor Author

So, to be on same page you propose:

git reset 3230199
git cherry-pick cf94936
git push

am I right?

@mlouielu

Copy link
Copy Markdown
Collaborator

So, to be on same page you propose:

git reset 3230199 git cherry-pick cf94936 git push

am I right?

  • git reset --hard HASH
  • ...
  • git push --force

You can check it with your git log, it should look like this:

commit 1b6918175a06b614e7f9462b0c18c11a5548eaf7 (HEAD -> pr_1990)
Author: Juan Carlos Francisco Stabile <[email protected]>
Date:   Wed Dec 15 22:36:20 2021 -0300

    Downgrade pipenv version to 2021.5.29

commit 32301994813de64134200e0512ee3614eae7f66f (origin/master, origin/HEAD, master)
Author: Juan Carlos Francisco Stabile <[email protected]>
Date:   Tue Dec 14 23:30:02 2021 -0300

    Add release note for bugfix on issue #1971

@jcfstabile

Copy link
Copy Markdown
Contributor Author

Good. Thank you.

@jcfstabile
jcfstabile force-pushed the fix/gi-not-found-on-run-local branch from 45417eb to ae5b238 Compare December 16, 2021 03:05
@Davidy22

Davidy22 commented Dec 16, 2021

Copy link
Copy Markdown
Collaborator

I don't have much of an issue with squashing to clean up commits, but it looks like CI is still failing. Error message:

Error: the command pytest could not be found within PATH or Pipfile's [scripts].

I remember hitting this one in my own endeavors to fix CI for pypi. My change in .github/workflows/ci.yml adding pytest pytest-cov pyfakefs to the pip install resolved this for me I think, I might have done some other things on top of that but it was a while ago now. Haven't committed this yet, still doesn't actually fix pypi yet

@Davidy22

Copy link
Copy Markdown
Collaborator

If it helps, you could cherry pick my changes, but I have a lot of scratch work in my repo and you might just be better off copying things where they might look relevant

@gsemet

gsemet commented Dec 16, 2021

Copy link
Copy Markdown
Member

Can you give a try with poetry ?

@gsemet

gsemet commented Jan 18, 2022

Copy link
Copy Markdown
Member

CI fixed in #2013

@gsemet gsemet closed this Jan 18, 2022
@gsemet

gsemet commented Jan 18, 2022

Copy link
Copy Markdown
Member

upgrading pipenv is not possible (setuptools, ...). Using poetry will fix this issue

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.

4 participants