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

Bump lfmerge version to 2.0.110 #1397

Merged
merged 1 commit into from
Apr 29, 2022
Merged

Bump lfmerge version to 2.0.110 #1397

merged 1 commit into from
Apr 29, 2022

Conversation

rmunn
Copy link
Collaborator

@rmunn rmunn commented Apr 29, 2022

Description

This fixes the issue where lfmerge would fail to start after make clean-volumes.

Type of Change

Only keep lines below that describe this change, then delete the rest.

  • Bug fix (non-breaking change which fixes an issue)

Testing on your branch

Please describe how to test and/or verify your changes. Provide instructions so we can reproduce. Please also provide relevant test data as necessary. These instructions will be used for QA testing below.

  • Run make clean-volumes, then make
  • Run docker logs -f lfmerge
  • Clone a new project

Checklist

  • I have performed a self-review of my own code
  • I have reviewed the title/description of this PR which will be used as the squashed PR commit message
  • I have commented my code, particularly in hard-to-understand areas
  • I have added tests that prove my fix is effective or that my feature works

qa.languageforge.org testing

Reviewers: add/replace your name below and check the box to sign-off/attest the feature works as expected on qa.languageforge.org

  • Reviewer1 (YYYY-MM-DD HH:MM)
  • Reviewer2 (YYYY-MM-DD HH:MM)

@rmunn rmunn self-assigned this Apr 29, 2022
@github-actions
Copy link

Unit Test Results

    1 files      1 suites   8s ⏱️
373 tests 373 ✔️ 0 💤 0

Results for commit cb957f5.

@rmunn rmunn enabled auto-merge (squash) April 29, 2022 04:08
@rmunn rmunn force-pushed the chore/bump-lfmerge-version branch from cb957f5 to 2200424 Compare April 29, 2022 07:41
Copy link
Collaborator

@megahirt megahirt left a comment

Choose a reason for hiding this comment

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

I have tested this on my local machine and LFMerge succeeds for two different S/R projects. Great work, @rmunn !

The one thing I haven't figured out yet is why the LFMerge logs are not showing on my local machine. Still a TODO but you've made a ton of progress on this - well done.

@rmunn rmunn merged commit 8164ccf into develop Apr 29, 2022
@rmunn rmunn deleted the chore/bump-lfmerge-version branch April 29, 2022 07:43
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