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

omp 1.4.0: refresh checksum due to changed upstream tarball #15294

Merged
merged 2 commits into from
Nov 15, 2019

Conversation

avsm
Copy link
Member

@avsm avsm commented Nov 15, 2019

fixes #15281

@samoht
Copy link
Member

samoht commented Nov 15, 2019

unrelated to the checksum fix, but it's broken on 4.02, ..., 4.07 due to:

#=== ERROR while compiling ocaml-migrate-parsetree.1.4.0 ======================#
# context              2.0.5 | linux/x86_64 | ocaml-base-compiler.4.02.3 | pinned(https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.4.0/ocaml-migrate-parsetree-v1.4.0.tbz)
# path                 ~/.opam/4.02/.opam-switch/build/ocaml-migrate-parsetree.1.4.0
# command              ~/.opam/4.02/bin/dune build -p ocaml-migrate-parsetree -j 2
# exit-code            1
# env-file             ~/.opam/log/ocaml-migrate-parsetree-23-a274f9.env
# output-file          ~/.opam/log/ocaml-migrate-parsetree-23-a274f9.out
### output ###
#       ocamlc src/.migrate_parsetree.objs/byte/migrate_parsetree__Migrate_parsetree_409_410_migrate.{cmi,cmo,cmt} (exit 2)
# (cd _build/default && /home/opam/.opam/4.02/bin/ocamlc.opt -w -40 -g -bin-annot -I src/.migrate_parsetree.objs/byte -I /home/opam/.opam/4.02/lib/ocaml/compiler-libs -I /home/opam/.opam/4.02/lib/ppx_derivers -I /home/opam/.opam/4.02/lib/result -no-alias-deps -open Migrate_parsetree__ -o src/.migrate_parsetree.objs/byte/migrate_parsetree__Migrate_parsetree_409_410_migrate.cmo -c -impl src/migrate_parsetree_409_410_migrate.pp.ml)
# File "src/migrate_parsetree_409_410_migrate.ml", line 22, characters 18-28:
# Error: Unbound module Option
#       ocamlc src/.migrate_parsetree.objs/byte/migrate_parsetree__Migrate_parsetree_410_409_migrate.{cmi,cmo,cmt} (exit 2)
# (cd _build/default && /home/opam/.opam/4.02/bin/ocamlc.opt -w -40 -g -bin-annot -I src/.migrate_parsetree.objs/byte -I /home/opam/.opam/4.02/lib/ocaml/compiler-libs -I /home/opam/.opam/4.02/lib/ppx_derivers -I /home/opam/.opam/4.02/lib/result -no-alias-deps -open Migrate_parsetree__ -o src/.migrate_parsetree.objs/byte/migrate_parsetree__Migrate_parsetree_410_409_migrate.cmo -c -impl src/migrate_parsetree_410_409_migrate.pp.ml)
# File "src/migrate_parsetree_410_409_migrate.ml", line 28, characters 17-27:
# Error: Unbound module Option

@samoht
Copy link
Member

samoht commented Nov 15, 2019

From https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases it seem that:

omd 1.4.0 works only with 4.08, 4.09 and 4.10
omd 1.4.1 restores compat with older compiler

So I'll add bounds for >= 4.08.

@samoht samoht changed the title omp 1.4.1: refresh checksum due to changed upstream tarball omp 1.4.0: refresh checksum due to changed upstream tarball Nov 15, 2019
@samoht samoht merged commit ac83984 into ocaml:master Nov 15, 2019
@samoht
Copy link
Member

samoht commented Nov 15, 2019

Merging this quickly to unlock other CIs -- the revdeps errors are unrelated.

@hannesm
Copy link
Member

hannesm commented Nov 15, 2019

FWIW here's a diff of the old tarball (231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8) and the new one.

omp-140.diff.txt

@samoht
Copy link
Member

samoht commented Nov 15, 2019

See #15300 for a new tentative fix. I completly forgot that the previous archive would be available in the cache, so I followed @hannesm's advice and modified the url instead of picking a new archive.

@diml this will need some more investigation from your side to understand which archive you really want to release for 1.4.0 (the previous one or the new one :p)

@avsm
Copy link
Member Author

avsm commented Nov 15, 2019

I think I know what happened here -- dune-release will overwrite an existing tag if the CHANGES file hasn't been updated. The same happened for uri for me recently. That accounts for the changes in the tarballs also (its the same as the diff from 1.4.0 to 1.4.1). Pointing to the cache until @diml is available to look into the upstream fix is the right solution indeed.

@avsm avsm deleted the omp-fix branch November 15, 2019 16:25
@ygrek
Copy link
Contributor

ygrek commented Nov 15, 2019

I don't agree with the fix, 1.4.0 original compiled find on 4.07 for example. 1.4.0 with new checksum does not - I believe it is some commit between 1.4.0 tag and 1.4.1 tag. I think opam repo should revert to previous archive and previous checksum (that's what I did in local opam mirror).

@ygrek
Copy link
Contributor

ygrek commented Nov 15, 2019

From https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases it seem that:
omd 1.4.0 works only with 4.08, 4.09 and 4.10

that page was modified yesterday, 1.4.0 was released to opam in
c4941bfcca 2019-07-04 Jeremie Dimino [new release] ocaml-migrate-parsetree (1.4.0)
and since then until yesteday it built fine with 4.07

talex5 added a commit to talex5/qubes-mirage-firewall that referenced this pull request Nov 17, 2019
- A new ocaml-migrate-parsetree.1.4.0 was released, replacing the old
  1.4.0 with new code. This was rejected by the checksum test.
  Fixed by updating to the latest opam-repository.
  See: ocaml/opam-repository#15294

- The latest opam-repository pulls in mirage 3.7, which doesn't work
  (`No available version of mirage-clock satisfies the constraints`), so
  pin the previous mirage 3.5.2 version instead.
talex5 added a commit to talex5/qubes-mirage-firewall that referenced this pull request Nov 17, 2019
- A new ocaml-migrate-parsetree.1.4.0 was released, replacing the old
  1.4.0 with new code. This was rejected by the checksum test.
  Fixed by updating to the latest opam-repository.
  See: ocaml/opam-repository#15294

- The latest opam-repository pulls in mirage 3.7, which doesn't work
  (`No available version of mirage-clock satisfies the constraints`), so
  pin the previous mirage 3.5.2 version instead.

- Mirage now generates `.merlin`, so remove it from Git.
@ghost
Copy link

ghost commented Nov 18, 2019

Just catching up on emails. I indeed overwrote the 1.4.0 release of omp by accident (cf #15280 (comment)).

I propose to restore the 1.4.0 release of omp by restoring the original archive. Let me know if that's a bad idea for some reason.

@mseri
Copy link
Member

mseri commented Nov 18, 2019

@diml that's a good idea, in the meantime we had pointed the opam file to the opam cache sources of the old tarball

@samoht
Copy link
Member

samoht commented Nov 23, 2019

@ygrek

I don't agree with the fix, 1.4.0 original compiled find on 4.07 for example. 1.4.0 with new checksum does not - I believe it is some commit between 1.4.0 tag and 1.4.1 tag. I think opam repo should revert to previous archive and previous checksum (that's what I did in local opam mirror).

For the record, I agree, it was a mistake that I have fixed it a few hours later with #15300

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bad checksum for ocaml-migrate-parsetree
5 participants