Skip to content

Commit

Permalink
Remove ssh/rsync bits
Browse files Browse the repository at this point in the history
Previously, a laptop/desktop setup was used to share tasks
between a powerful desktop for building/testing and a simple laptop
to sign/upload things.

This setup was useful before, but:

- It is not made optional/configurable, so those who don't need it (actually,
  just me) had to either dirty edit akefile or run separate targets manually,
  which can ruin releases (and quite possible did)
- Most machines nowadays can do a release just fine (arguable). A 2016 laptop
  with 2 cores could do it and release managers probably use something more
  interesting.

If anyone considers this setup to be worthy, please re-introduce it,
making it completely optional and turned off by default or
become a release manager while also reverting this commit.
  • Loading branch information
Altai-man authored and vrurg committed Sep 15, 2020
1 parent 7d7b72a commit 583b430
Showing 1 changed file with 7 additions and 39 deletions.
46 changes: 7 additions & 39 deletions tools/releasable/Akefile
Expand Up @@ -22,11 +22,6 @@ use File::Directory::Tree;

my $THREADS = 7;

# These are used so that you can run tests on a faster machine.
my $SSH = alex@localhost; # TODO make it configurable
my $SSH-PATH = /home/alex/git/Releasable/; # TODO make it configurable
my $RSYNC = $SSH:$SSH-PATH;

my $WIKIPEDIA-NAME = %*ENV<WIKIPEDIA-NAME>; # currently not used
my $ANTIFLAP = 3;

Expand Down Expand Up @@ -95,40 +90,25 @@ task ‘all’ => ‘clean’, { # except human-upload
True
}

task ssh-all => clean, { # except human-upload
# TODO maybe don't runout but just depend on other tasks
# You may need to *prepend* PATH modifications in bashrc
run <ssh -t>, $SSH, cd $SSH-PATH && ake clean;
run <ake human-1>;
run <ssh -t>, $SSH, cd $SSH-PATH && ake nqp;
run <ake human-2>;
run <ssh -t>, $SSH, cd $SSH-PATH && ake rakudo;
run <ake human-3>;
say Now run 「ake human-upload」 to publish your changes;
True
}

task all-rakudo-only => clean, {
# TODO maybe don't runout but just depend on other tasks
# You may need to *prepend* PATH modifications in bashrc
run <ssh -t>, $SSH, cd $SSH-PATH && ake clean;
run <ake get-all rsync-push>; # just 「get-all」 and 「rsync-push」 instead of 「human-1」
run <ssh -t>, $SSH, cd $SSH-PATH && ake nqp;
run <ake get-all>; # just 「get-all」 instead of 「human-1」
run <ake nqp>;
run <ake human-2>;
run <ssh -t>, $SSH, cd $SSH-PATH && ake rakudo;
run <ake rakudo>;
run <ake human-3>;
say Now run 「ake human-upload-rakudo-only」 to publish your changes;
True
}

########## Aggregates ##########

task human-1 => <get-all nqp-bump-moar nqp-bump nqp-tag rsync-push>;
task human-1 => <get-all nqp-bump-moar nqp-bump nqp-tag>;
# TODO ensure human-1
task nqp => <nqp-build nqp-test nqp-archive nqp-extract
nqp-post-build nqp-post-test>;
task human-2 => <rsync-pull nqp-sign rakudo-bump-nqp rakudo-bump
rsync-push>;
task human-2 => <nqp-sign rakudo-bump-nqp rakudo-bump>;
task human-2-extra => <rakudo-manual-check rakudo-leap-seconds
rakudo-changelog rakudo-announcement
rakudo-release-guide rakudo-ensure-moarvm
Expand All @@ -139,7 +119,7 @@ task ‘rakudo’ => <rakudo-build rakudo-test
rakudo-archive rakudo-extract
rakudo-post-build rakudo-post-test>;

task human-3 => <rsync-pull rakudo-tag rakudo-sign>;
task human-3 => <rakudo-tag rakudo-sign>;
task human-upload => <wait
nqp-push-check rakudo-push-check
nqp-push rakudo-push
Expand All @@ -153,18 +133,6 @@ task ‘human-canary-upload’ => <nqp-canary-upload rakudo-canary-upload>;

########## Misc ##########

task rsync-pull, {
run <rsync --archive --fuzzy --delete
--compress --human-readable>, $RSYNC, .;
True
}

task rsync-push, {
run <rsync --archive --fuzzy --delete
--compress --human-readable>, ., $RSYNC;
True
}

task clean, {
rmtree $MOAR-PATH if $MOAR-PATH.e;
rmtree $NQP-PATH if $NQP-PATH.e;
Expand Down Expand Up @@ -364,7 +332,7 @@ task ‘rakudo-manual-check’, { # Step ❶ (rakudo release guide)
say + Review the RT queue;
say + Update the release announcement draft;
say ;
say Everything else will be done for you by this Akefilefile;
say Everything else will be done for you by this Akefile;
# TODO more?
}

Expand Down

0 comments on commit 583b430

Please sign in to comment.