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

Update mercurial version #333

Merged
merged 44 commits into from
Mar 27, 2024
Merged

Update mercurial version #333

merged 44 commits into from
Mar 27, 2024

Commits on Mar 4, 2024

  1. Configuration menu
    Copy the full SHA
    1582036 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    504c8e4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f2a0573 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a1bf64a View commit details
    Browse the repository at this point in the history
  5. Fix installer for Mercurial 6

    Mercurial 6 doesn't have the httpclient directory any more, so the
    installer can ignore it.
    rmunn committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    4b05737 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9438d15 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c8b8aea View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    030fc97 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Go back to Mercurial 3.0.3.11

    This reverts to commit 1582036,
    discarding everything done on this branch since that commit.
    rmunn committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    317ff12 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    92e5cd1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1f80c15 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    480d7f9 View commit details
    Browse the repository at this point in the history
  5. Revert "Go back to Mercurial 3.0.3.11"

    This reverts commit 317ff12 and goes
    back to Mercurial 6.
    rmunn committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    2abcd66 View commit details
    Browse the repository at this point in the history
  6. Use fixed Mercurial package

    rmunn committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    431d81b View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Fix libdl.so error in GHA build

    rmunn committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    26274c2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d35f864 View commit details
    Browse the repository at this point in the history
  3. Tests should use same LCModel version as core code

    Core code was using version 11.0.0-beta0077 but tests were still on
    LCModel version 10. Update tests to use 11.0.0-beta0077 as well.
    rmunn committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    67aa5ff View commit details
    Browse the repository at this point in the history
  4. More NuGet version updates

    rmunn committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    9183353 View commit details
    Browse the repository at this point in the history
  5. LCModel.Core copy step needs TargetDir

    TargetDir is defined by Visual Studio but not by the dotnet CLI tools
    rmunn committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    ac66b0d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    737b0fc View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3f80dc2 View commit details
    Browse the repository at this point in the history
  8. Less spammy LD_DEBUG

    rmunn committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    3a26838 View commit details
    Browse the repository at this point in the history
  9. Try LD_DEBUG=files

    rmunn committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    f3ed495 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    598c5aa View commit details
    Browse the repository at this point in the history
  11. Remove LD_DEBUG env var

    rmunn committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    d3f4d05 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    ac548ca View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. New GHA workflow for simpler dotnet build

    This workflow uses `dotnet test` and `dotnet build` steps directly in
    the GHA runner, rather than building an LfMerge builder image. That way
    it's a lot easier to understand the build process, and to replicate it
    on dev machines (just do `dotnet build` and `dotnet test`).
    rmunn committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    528878f View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. pbuild.sh shouldn't fail if dotnet clean does

    dotnet clean can sometimes fail if, for example, you're switching from
    targeting net6.0 to net8.0. That's not a problem, so we let the script
    continue if the `dotnet clean` step fails.
    rmunn committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    445da79 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    01760ec View commit details
    Browse the repository at this point in the history
  3. Select correct ChorusMerge runtime config

    Now that ChorusMerge builds for net8.0, we should copy its net8.0
    runtimeconfig.json to our build output, not the older net6.0 one.
    rmunn committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    68e1564 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    45aa86b View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Add missing Mercurial package to Docker image

    Mercurial 6 needs hgdemandimport to live alongside hgext.
    rmunn committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    4e5450c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    78f92d4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    98238a7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a077b24 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e493084 View commit details
    Browse the repository at this point in the history
  6. Have pbuild.sh script tag builds with branch name

    This will allow us to more easily run a local build and deploy it to
    local LF for testing, without having to wait for a GHA workflow.
    rmunn committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    7933f62 View commit details
    Browse the repository at this point in the history
  7. We know the GHA workflow works, remove test branch

    Now that we know the GHA workflow works, we no longer need to run it
    on pushes to the test branch. We can simply run it on pull requests and
    that's it.
    rmunn committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    58ef773 View commit details
    Browse the repository at this point in the history
  8. Try uploading files directly, not in tarball

    We used to need to upload a tarball because GitHub Actions wasn't
    preserving Unix file permissions in the .zip file it would upload, so
    things like executable bits were getting stripped. Now that there's an
    upload-artifact@v4 that works on different principles internally, let's
    see if this step is still necessary. If this procudes Docker images that
    still run, we might be able to save some build time.
    
    We also comment out the `dotnet test` step here to save 7 minutes of
    waiting for the build; the affected code is after the `dotnet test` so
    it will continue to pass but tell us nothing about the changes here.
    rmunn committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    ef85f96 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    dd24720 View commit details
    Browse the repository at this point in the history
  10. Fix download folder name

    rmunn committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    c499396 View commit details
    Browse the repository at this point in the history
  11. No longer need buildx in build step

    Will we need it in the release step? Let's leave it out for now and see
    what happens.
    rmunn committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    b0138b0 View commit details
    Browse the repository at this point in the history
  12. Restore tarball step as it really is needed

    GitHub Actions upload-artifact still strips executable bits, so we still
    need the step of creating a .tar.gz file.
    rmunn committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    7b9b70f View commit details
    Browse the repository at this point in the history
  13. Clean up TODO comment

    rmunn committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    7d4fabd View commit details
    Browse the repository at this point in the history