This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9451

heptapod-ci: automatically refresh existing phabricator Diff on push
ClosedPublic

Authored by marmoute on Nov 28 2020, 9:15 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGc7f40562389f: heptapod-ci: automatically refresh existing phabricator Diff on push
Summary

If a changeset have been submitted to Phabricator and a new version is pushed to
heptapod, we should refresh the state on Phabricator. If we do not do this, they
are a risk of an older version being applied from Phabricator. In this situation
content-divergence will be (rightfully) detected by evolution.

We only refresh the Diff if the test pass, to avoid updating Phabricator with
broken content.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Nov 28 2020, 9:15 PM
mharbison72 added a subscriber: mharbison72.Nov 28 2020, 11:16 PM
mharbison72 added inline comments.
contrib/heptapod-ci.yml
121

I don't see this script in the hg repo, or is this grabbed from somewhere else?

marmoute planned changes to this revision.Nov 29 2020, 6:31 AM

I need this diff to exist to testing. But I have no reason to think it is ready yet.

baymax updated this revision to Diff 23832.Nov 29 2020, 9:09 AM
marmoute updated this revision to Diff 23836.Nov 29 2020, 9:45 AM
baymax updated this revision to Diff 23844.Nov 29 2020, 10:52 AM
marmoute added a comment.EditedNov 29 2020, 10:56 AM

I love it when a plan comes together !

contrib/heptapod-ci.yml
121

It was in the previous revisions that did not got sent from my laptop.

mharbison72 accepted this revision.Dec 1 2020, 10:58 PM

Queued, thanks. I assume D9459 is still not ready/to be abandoned, based on the comment?

This revision is now accepted and ready to land.Dec 1 2020, 10:58 PM

Revision Contents
Changeset List

PathPackages
Mcontrib/heptapod-ci.yml (6 lines)

Diff 23922

contrib/heptapod-ci.yml

stages: stages:
- tests - tests
- phabricator
image: registry.heptapod.net/mercurial/ci-images/mercurial-core image: registry.heptapod.net/mercurial/ci-images/mercurial-core
# The runner made a clone as root. # The runner made a clone as root.
# We make a new clone owned by user used to run the step. # We make a new clone owned by user used to run the step.
before_script: before_script:
- hg clone . /tmp/mercurial-ci/ --noupdate --config phases.publish=no - hg clone . /tmp/mercurial-ci/ --noupdate --config phases.publish=no
- hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'` - hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'`
- make rust-tests - make rust-tests
rust-cargo-test-py3: rust-cargo-test-py3:
stage: tests stage: tests
<<: *rust_cargo_test <<: *rust_cargo_test
variables: variables:
PYTHON: python3 PYTHON: python3
phabricator-refresh:
stage: phabricator
script:
- ./contrib/phab-refresh-stack.sh
rust-cargo-test-py3-dirstate-tree: rust-cargo-test-py3-dirstate-tree:
<<: *rust_cargo_test <<: *rust_cargo_test
variables: variables:
PYTHON: python3 PYTHON: python3
HG_RUST_FEATURES: dirstate-tree HG_RUST_FEATURES: dirstate-tree
test-py2: test-py2:
<<: *runtests <<: *runtests
PYTHON: python3 PYTHON: python3
TEST_HGMODULEPOLICY: "rust+c" TEST_HGMODULEPOLICY: "rust+c"
HG_RUST_FEATURES: "dirstate-tree" HG_RUST_FEATURES: "dirstate-tree"
test-py2-chg: test-py2-chg:
<<: *runtests <<: *runtests
variables: variables:
RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg" RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg"
TEST_HGMODULEPOLICY: "c" TEST_HGMODULEPOLICY: "c"
mharbison72Unsubmitted
Not Done

I don't see this script in the hg repo, or is this grabbed from somewhere else?

mharbison72: I don't see this script in the hg repo, or is this grabbed from somewhere else?
marmouteAuthorUnsubmitted
Done

It was in the previous revisions that did not got sent from my laptop.

marmoute: It was in the previous revisions that did not got sent from my laptop.