Merge live branch back into master

[dra27]

• opam-2.ocaml.org no longer pulling master branch (see Migrate deployment for opam.ocaml.org from EC2 to Scaleway ocaml/infrastructure#19 (comment))

[tmcgilchrist]

Can we simplify the ocurrent-deployer setup for this project once this is merged?

[dra27]

This PR is a "fake" merge commit - that is, it leaves the tree of master exactly at the tree of live, discarding the master tree completely. The HEAD commit of this PR (64e8434), therefore, is identical to upstream/live @ 937ee34.

Just to show the working: live and master have an effective common base of bba77e7 (that's not the merge-base, but earlier, since #205 was reverted on master). Ignoring PRs which were then merged to master and subsequently reverted, master since then contains #216, which is not needed as live has #215 instead, and #224, which is already on live.

[tmcgilchrist]

Thank you for fixing this @dra27 It will be great to get this piece of infrastructure finally sorted out.

[avsm]

I don't understand all the branching and merging going on here I'm afraid. What needs to happen next to get this merged, and opam2web building off main again, and subsequently the expired PGP key at ocaml/infrastructure#46 updated?

[dra27]

This PR just needs approving and merging! All it does is make master the same as live without any force pushing.

[dra27]

I don't know if the output from the visualizer is easier to interpret than GitHub's interface: this PR is literally one commit merging the live branch (which is presently deployed to opam.ocaml.org) into master (which is no longer deployed), leaving master with exactly the same content as live.

(the "working" above is just an explanation for "copying" live to master doesn't lose anything)

[avsm]

Looks good, I believe dra27 :-)

[avsm]

But now, we do need to update the signing key live -- does that just have to go to the master branch and then pushed to live to be picked up the deployer?

[dra27]

That's right, yes - PR to master with the new key, it can be test-pushed to staging before merging (though probably not necessary for a static file) but should only be pushed to live after the PR's been merged on master. With this PR merged, the instructions/notes on /~https://github.com/ocaml-opam/opam2web#deployment are now actually correct 🙂