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

reduce allow-newer entries for shake-bench #2101

Merged
merged 2 commits into from
Aug 17, 2021
Merged

Conversation

pepeiborra
Copy link
Collaborator

Clean up the cabal.project overrides required by shake-bench. There are two overrides left, we would need a Hackage trustee to do a minor revision.

@pepeiborra pepeiborra mentioned this pull request Aug 16, 2021
Copy link
Member

@jneira jneira left a comment

Choose a reason for hiding this comment

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

thanks for take a look and fix it

@jneira jneira added the merge me Label to trigger pull request merge label Aug 16, 2021
@jneira
Copy link
Member

jneira commented Aug 17, 2021

Tests failed with

 Running 1 test suites...
Test suite ghcide-tests: RUNNING...
ghcide
  Unit
    timestamps have millisecond resolution: FAIL (0.02s)
      test/exe/Main.hs:5677:
      Timestamps do not have millisecond resolution: 10000us

1 out of 1 tests failed (0.02s)

strange, it does not seem a transient error 🤔

@pepeiborra pepeiborra merged commit f3620d1 into master Aug 17, 2021
@jneira
Copy link
Member

jneira commented Aug 18, 2021

@Mergifyio backport 1.3.0-hackage

mergify bot pushed a commit that referenced this pull request Aug 18, 2021
* reduce allow-newer entries for shake-bench

* fix comma

(cherry picked from commit f3620d1)

# Conflicts:
#	cabal.project
@mergify
Copy link
Contributor

mergify bot commented Aug 18, 2021

Command backport 1.3.0-hackage: success

Backports have been created

jneira added a commit that referenced this pull request Aug 18, 2021
* reduce allow-newer entries for shake-bench (#2101)

* reduce allow-newer entries for shake-bench

* fix comma

(cherry picked from commit f3620d1)

# Conflicts:
#	cabal.project

* Resolve conflicts

* Remove allow-newer again 🤦

* Update index state for ghc-9.0.1

Co-authored-by: Pepe Iborra <pepeiborra@gmail.com>
Co-authored-by: jneira <atreyu.bbb@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge me Label to trigger pull request merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants