You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: source/Reviewers/howtocommit.rst
+9-5Lines changed: 9 additions & 5 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -466,15 +466,19 @@ Supporting data is stored in the filesystems of our machines and changes to use
466
466
latter case, the update will need redoing by the reviewer before commit
467
467
if there are merge conflicts in the checksum files.
468
468
469
-
1. Run the rose stem tasks that require a KGO update, plus any other testing required (see above) - if unsure run the `all` group.
469
+
1. Fix any merge conflicts in the checksums - it shouldn't matter which merge option is selected as you will be overwriting these checksum files again in the following steps.
470
+
471
+
2. Run the rose stem tasks that require a KGO update, plus any other testing required (see above) - if unsure run the `all` group.
470
472
471
473
.. code-block:: RST
472
474
473
475
export CYLC_VERSION=8
474
476
rose stem --group=all
475
477
cylc play <suite name>
476
478
477
-
2. Run the checksum update script stored in `<working copy>/rose-stem/bin`.
479
+
3. Ensure the failing KGO's match those on the branch.
480
+
481
+
4. Run the checksum update script stored in `<working copy>/rose-stem/bin`.
478
482
479
483
.. code-block::
480
484
@@ -486,11 +490,11 @@ Supporting data is stored in the filesystems of our machines and changes to use
486
490
487
491
.. note::
488
492
The numbered run directory must be included in the suite name, eg. `name-of-suite/run1`.
489
-
490
493
491
-
3. Verify the checksums updated properly by retriggering the failed checksums. First retrigger
494
+
495
+
5. Verify the checksums updated properly by retriggering the failed checksums. First retrigger
492
496
``export-source``, and then when complete ``export-source_xc40`` if new checksums are present
493
-
there (there is no need to retigger spice). You may need to change the maximum window extent
497
+
there (there is no need to retigger spice). You may need to change the maximum window extent
494
498
of the gui in order to see the succeeded tasks. Now you can retrigger the failed checksums -
495
499
these should now pass if the kgo was updated in the working copy correctly.
0 commit comments