From f7e7679bcdaada8926df21e9de5ae101addf45ee Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Sat, 16 Nov 2019 16:29:43 +0100
Subject: Replace Linenoise with Readline

---
 .gitlab-ci.yml       | 2 +-
 .gitmodules          | 6 ++++++
 Dockerfile           | 2 +-
 modules/LibraryCheck | 1 +
 modules/Linenoise    | 1 -
 modules/MODULES.txt  | 7 ++++---
 modules/Readline     | 1 +
 7 files changed, 14 insertions(+), 6 deletions(-)
 create mode 160000 modules/LibraryCheck
 delete mode 160000 modules/Linenoise
 create mode 160000 modules/Readline

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcb0eff..2e0e1a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ Rakudo Star:
   stage: Build
   image: alpine:latest
   before_script:
-    - apk add --no-cache coreutils bash build-base git linenoise-dev perl
+    - apk add --no-cache coreutils bash build-base git openssl-dev perl readline-dev
     - bin/mkchecksum.sh "work/release/rakudo-star-$CI_COMMIT_REF_NAME.tar.gz"
     - mkdir -p "$CI_PROJECT_DIR/work/build"
     - cd -- "$CI_PROJECT_DIR/work/build"
diff --git a/.gitmodules b/.gitmodules
index 9cd06e3..6583850 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -172,3 +172,9 @@
 [submodule "modules/Test::Output"]
 	path = modules/Test::Output
 	url = git://github.com/perl6-community-modules/perl6-Test-Output.git
+[submodule "modules/LibraryCheck"]
+	path = modules/LibraryCheck
+	url = git://github.com/jonathanstowe/LibraryCheck.git
+[submodule "modules/Readline"]
+	path = modules/Readline
+	url = git://github.com/drforr/perl6-readline.git
diff --git a/Dockerfile b/Dockerfile
index 012e31e..3117420 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ COPY work /tmp/work
 
 WORKDIR /tmp/rakudo-star
 
-RUN apk add --no-cache build-base git perl perl-utils libressl
+RUN apk add --no-cache build-base git perl perl-utils openssl-dev readline-dev
 RUN tar xzf "/tmp/work/release/rakudo-star-$VERSION.tar.gz"
 RUN cd -- "rakudo-star-$VERSION" \
 	&& perl Configure.pl --prefix=/usr/local --backend=moar --gen-moar --make-install
diff --git a/modules/LibraryCheck b/modules/LibraryCheck
new file mode 160000
index 0000000..e713a7f
--- /dev/null
+++ b/modules/LibraryCheck
@@ -0,0 +1 @@
+Subproject commit e713a7f773f3352801bd43d399e3bdcb3baae5f0
diff --git a/modules/Linenoise b/modules/Linenoise
deleted file mode 160000
index 480fd91..0000000
--- a/modules/Linenoise
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 480fd919b2c082e691c518fd50c19ad8719532b6
diff --git a/modules/MODULES.txt b/modules/MODULES.txt
index ce332f3..c02c62f 100644
--- a/modules/MODULES.txt
+++ b/modules/MODULES.txt
@@ -43,10 +43,9 @@ File::Temp                 # File::Directory::Tree
 File::Find
 p6doc                      # File::Temp
 Debugger::UI::CommandLine
-Shell::Command
-LibraryMake                # check needed?
-Linenoise
 File::Which
+Shell::Command             # File::Which, File::Temp
+LibraryMake                # Shell::Command
 IO::String
 DateTime::Format
 DateTime::Parse            # HTTP::UserAgent
@@ -57,3 +56,5 @@ JSON::RPC                  # PSGI, HTTP::Useragent
 Getopt::Long
 TAP
 App::Prove6
+LibraryCheck
+Readline                   # LibraryCheck
diff --git a/modules/Readline b/modules/Readline
new file mode 160000
index 0000000..054a8e9
--- /dev/null
+++ b/modules/Readline
@@ -0,0 +1 @@
+Subproject commit 054a8e9461e79473099b2e75e4a5e0797adae3a7
-- 
cgit v1.1


From b8d2d98b77acc7489ec2e5cab9afcbf6c0167a66 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Sat, 16 Nov 2019 17:10:51 +0100
Subject: Fix typo in HTTP::UserAgent entry

---
 modules/MODULES.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/MODULES.txt b/modules/MODULES.txt
index c02c62f..ce308a1 100644
--- a/modules/MODULES.txt
+++ b/modules/MODULES.txt
@@ -51,8 +51,8 @@ DateTime::Format
 DateTime::Parse            # HTTP::UserAgent
 IO::Capture::Simple
 Test::Util::ServerPort
-HTTP::Useragent
-JSON::RPC                  # PSGI, HTTP::Useragent
+HTTP::UserAgent
+JSON::RPC                  # PSGI, HTTP::UserAgent
 Getopt::Long
 TAP
 App::Prove6
-- 
cgit v1.1


From cd3796deea1b2778db82c47425265955c37a805d Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Sat, 16 Nov 2019 17:44:57 +0100
Subject: Add Encode as dependency for HTTP::UserAgent

---
 .gitmodules         | 3 +++
 modules/Encode      | 1 +
 modules/MODULES.txt | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 160000 modules/Encode

diff --git a/.gitmodules b/.gitmodules
index 6583850..46597d9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -178,3 +178,6 @@
 [submodule "modules/Readline"]
 	path = modules/Readline
 	url = git://github.com/drforr/perl6-readline.git
+[submodule "modules/Encode"]
+	path = modules/Encode
+	url = git://github.com/sergot/perl6-encode.git
diff --git a/modules/Encode b/modules/Encode
new file mode 160000
index 0000000..702214d
--- /dev/null
+++ b/modules/Encode
@@ -0,0 +1 @@
+Subproject commit 702214dcedd05ea62d815ffb4c287e1596cee4c9
diff --git a/modules/MODULES.txt b/modules/MODULES.txt
index ce308a1..3a489b7 100644
--- a/modules/MODULES.txt
+++ b/modules/MODULES.txt
@@ -51,7 +51,8 @@ DateTime::Format
 DateTime::Parse            # HTTP::UserAgent
 IO::Capture::Simple
 Test::Util::ServerPort
-HTTP::UserAgent
+Encode
+HTTP::UserAgent            # Encode
 JSON::RPC                  # PSGI, HTTP::UserAgent
 Getopt::Long
 TAP
-- 
cgit v1.1


From 883ab86093d8ce507cefb4e28aaa753a2f9082dc Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 5 Dec 2019 14:57:31 +0100
Subject: Update distribution modules

---
 modules/DBIish                | 2 +-
 modules/Encode                | 2 +-
 modules/File::Directory::Tree | 2 +-
 modules/JSON::Fast            | 2 +-
 modules/License::SPDX         | 2 +-
 modules/Readline              | 2 +-
 modules/p6doc                 | 2 +-
 modules/zef                   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/DBIish b/modules/DBIish
index 1131284..496aed3 160000
--- a/modules/DBIish
+++ b/modules/DBIish
@@ -1 +1 @@
-Subproject commit 1131284aa434b630e1ee7bd2602cf5cc73f78c9a
+Subproject commit 496aed3fd2abd5cfc73b910335e090197e810996
diff --git a/modules/Encode b/modules/Encode
index 702214d..4c7c0e3 160000
--- a/modules/Encode
+++ b/modules/Encode
@@ -1 +1 @@
-Subproject commit 702214dcedd05ea62d815ffb4c287e1596cee4c9
+Subproject commit 4c7c0e3b4f86216c2dace7855197f1d9086a7775
diff --git a/modules/File::Directory::Tree b/modules/File::Directory::Tree
index 25faef9..12f1ab5 160000
--- a/modules/File::Directory::Tree
+++ b/modules/File::Directory::Tree
@@ -1 +1 @@
-Subproject commit 25faef927c83eea1b688b5a324d5e11011f7305f
+Subproject commit 12f1ab52191efa38787de26e5a8d4c01a94d03a8
diff --git a/modules/JSON::Fast b/modules/JSON::Fast
index 3a29ede..eb6ae0d 160000
--- a/modules/JSON::Fast
+++ b/modules/JSON::Fast
@@ -1 +1 @@
-Subproject commit 3a29ede8ec738b185a71f11b462cbb63bc8b8b70
+Subproject commit eb6ae0d339ed2441eb9df7758e3e1b6609eb5141
diff --git a/modules/License::SPDX b/modules/License::SPDX
index 6e7d547..f37cdac 160000
--- a/modules/License::SPDX
+++ b/modules/License::SPDX
@@ -1 +1 @@
-Subproject commit 6e7d5477a59b364317bee162eb1b00ef8884a25a
+Subproject commit f37cdac8d3177c82ea095a66907331e033152e08
diff --git a/modules/Readline b/modules/Readline
index 054a8e9..0d380bc 160000
--- a/modules/Readline
+++ b/modules/Readline
@@ -1 +1 @@
-Subproject commit 054a8e9461e79473099b2e75e4a5e0797adae3a7
+Subproject commit 0d380bc191698d09ec0557e773e16ba773088d3e
diff --git a/modules/p6doc b/modules/p6doc
index cfa072a..5bb0e8c 160000
--- a/modules/p6doc
+++ b/modules/p6doc
@@ -1 +1 @@
-Subproject commit cfa072a239efb33d9517a21534b561cc5f24c998
+Subproject commit 5bb0e8c8f980f3f31517d5e9df664a23bd1de421
diff --git a/modules/zef b/modules/zef
index 9db010a..0484e30 160000
--- a/modules/zef
+++ b/modules/zef
@@ -1 +1 @@
-Subproject commit 9db010a4f32c4af866832c3979d0fcf5211a64a6
+Subproject commit 0484e30ba82f7860b785e2a1d7759379b2c78488
-- 
cgit v1.1


From 7324559471ba0fe65b0e79b4fac8a9983dca20ea Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 5 Dec 2019 14:57:56 +0100
Subject: Bump component versions

---
 tools/star/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/star/Makefile b/tools/star/Makefile
index a1b879a..dff0044 100644
--- a/tools/star/Makefile
+++ b/tools/star/Makefile
@@ -2,9 +2,9 @@
 # eg. 2017.07 etc.
 # Occasionally (mis-)used to pull in fixes (see 'lastmin-fixes.txt')
 # eg. 2017.07-9-gc0abee7 etc.
-RAKUDO_VER  = 2019.07.1
-NQP_VER     = 2019.07.1
-MOAR_VER    = 2019.07.1
+RAKUDO_VER  = 2019.11
+NQP_VER     = 2019.11
+MOAR_VER    = 2019.11
 
 STAR_REL    = rakudo-star-$(VERSION)
 STAR_TGZ    = $(STAR_REL).tar.gz
-- 
cgit v1.1


From 7ddedb42b8dd97c5e4f97f74d0787f48b3580dda Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 5 Dec 2019 14:58:53 +0100
Subject: Bump Rakudo Star version

---
 tools/build/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index 59f9480..9befd0c 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/Makefile.in
@@ -3,7 +3,7 @@
 MOAR_DIR     = moarvm
 NQP_DIR      = nqp
 RAKUDO_DIR   = rakudo
-STAR_VERSION = 2019.07
+STAR_VERSION = 2019.11
 
 # install location
 PREFIX_DIR         = @prefix@
-- 
cgit v1.1


From 5939f06f4dc29cd3c39b625c00dfa8fd5d1374d8 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 5 Dec 2019 15:11:48 +0100
Subject: Update the source URLs in the Makefile to use upstream

---
 tools/star/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/star/Makefile b/tools/star/Makefile
index dff0044..3744e21 100644
--- a/tools/star/Makefile
+++ b/tools/star/Makefile
@@ -17,7 +17,7 @@ RAKUDO_TGZ = rakudo-$(RAKUDO_VER).tar.gz
 RAKUDO_URL = https://rakudo.perl6.org/downloads/rakudo/$(RAKUDO_TGZ)
 RAKUDO_SRC = $(SRC_DIR)/$(RAKUDO_TGZ)
 NQP_TGZ    = nqp-$(NQP_VER).tar.gz
-NQP_URL    = https://dist.tyil.nl/raku/nqp/$(NQP_TGZ)
+NQP_URL    = https://rakudo.perl6.org/downloads/nqp/$(NQP_TGZ)
 NQP_SRC    = $(SRC_DIR)/$(NQP_TGZ)
 MOAR_TGZ   = MoarVM-$(MOAR_VER).tar.gz
 MOAR_URL   = https://www.moarvm.org/releases/$(MOAR_TGZ)
-- 
cgit v1.1


From 009aa7e91793ce43e73324dad22bed9917500756 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 5 Dec 2019 16:06:11 +0100
Subject: Skip testing phase when installing Rakudo Star

---
 tools/build/module-install.pl | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/build/module-install.pl b/tools/build/module-install.pl
index af6845f..eadb99e 100644
--- a/tools/build/module-install.pl
+++ b/tools/build/module-install.pl
@@ -17,9 +17,15 @@ while (<>) {
 
 	# Create the command list
 	my @cmd = (
-		$perl6bin, $zefbin,
-		'--/build-depends', '--/test-depends', '--/depends', 
-		'--force', 'install', "./modules$path_sep$module"
+		$perl6bin,
+		$zefbin,
+		'--/build-depends',
+		'--/depends',
+		'--/test',
+		'--/test-depends',
+		'--force',
+		'install',
+		"./modules$path_sep$module"
 	);
 
 	# Show the command that's going to be ran, for debugging purposes
-- 
cgit v1.1


From bbbcf20d4c15a9378d89b5cccbc19a48c65d5f22 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 5 Dec 2019 16:10:33 +0100
Subject: Add openssl and readline development packages for testing

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e0e1a2..98b7ad8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,7 @@ Community Modules:
   stage: Test
   image: alpine:latest
   before_script:
-    - apk add --no-cache build-base perl
+    - apk add --no-cache build-base openssl-dev perl readline-dev
     - cd -- "work/build/rakudo-star-$CI_COMMIT_REF_NAME"
   script:
     - make modules-test
-- 
cgit v1.1


From 00f451632167fff34c94b5b9c81117e16b67d94a Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 5 Dec 2019 16:54:54 +0100
Subject: Use verbose module testing

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98b7ad8..84a9592 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,7 +70,7 @@ Community Modules:
     - apk add --no-cache build-base openssl-dev perl readline-dev
     - cd -- "work/build/rakudo-star-$CI_COMMIT_REF_NAME"
   script:
-    - make modules-test
+    - make verbose-modules-test
 
 Docker:
   stage: Release
-- 
cgit v1.1


From fe8e97975194a47772ecdaef4462cd99d9e5c891 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 5 Dec 2019 16:55:08 +0100
Subject: Update modules-test script

---
 tools/build/modules-test.pl | 49 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/tools/build/modules-test.pl b/tools/build/modules-test.pl
index 396f066..1c8239b 100644
--- a/tools/build/modules-test.pl
+++ b/tools/build/modules-test.pl
@@ -1,5 +1,8 @@
 #! perl
 
+use warnings;
+use strict;
+
 use Cwd;
 use Getopt::Long;
 
@@ -9,17 +12,39 @@ my $base = shift @ARGV;
 my $perl6 = shift @ARGV;
 
 while (<>) {
-    next if /^\s*(#|$)/;
-    my ($moduledir) = /(\S+)/;
-    print "Testing modules/$moduledir with $perl6...\n";
-    if (-d "$base/modules/$moduledir/t") {
-        chdir("$base/modules/$moduledir");
-        system('prove', $verbose ? '-v' : (), '-e', $perl6, '-r', 't');
-    }
-    else {
-        print "...no t/ directory found.\n";
-    }
-    print "\n";
+	# Skip comments
+	next if /^\s*(#|$)/;
+
+	# Extract only the module name from the current line
+	my ($moduledir) = /(\S+)/;
+
+	# Run the tests through prove
+	if (-d "$base/modules/$moduledir/t") {
+		chdir("$base/modules/$moduledir");
+
+		my @cmd = (
+			'prove',
+			$verbose ? '-v' : (),
+			'-e', $perl6,
+			'-r',
+			't',
+		);
+
+		# Show the command that's going to be ran, for debugging purposes
+		print "@cmd\n";
+
+		# Actually run the command
+		my $exit = system "@cmd";
+
+		# Exit early if any errors occurred
+		exit 1 if $exit;
+	}
+	else {
+		print "...no t/ directory found.\n";
+	}
+
+	print "\n";
 }
 
-0;
+# If we reach this, no errors have been found
+exit 0;
-- 
cgit v1.1


From 4f00646962d0bad4972be457aa244fc58b3c35ab Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 5 Dec 2019 17:32:38 +0100
Subject: Include Test::Harness package for module testing

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84a9592..d8c68ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,7 @@ Community Modules:
   stage: Test
   image: alpine:latest
   before_script:
-    - apk add --no-cache build-base openssl-dev perl readline-dev
+    - apk add --no-cache build-base openssl-dev perl perl-test-harness readline-dev
     - cd -- "work/build/rakudo-star-$CI_COMMIT_REF_NAME"
   script:
     - make verbose-modules-test
-- 
cgit v1.1


From 1308da5062946cd56573894af89e98ba8ce45ac5 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 5 Dec 2019 21:05:02 +0100
Subject: Update modules-test to show cwd

---
 tools/build/modules-test.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/build/modules-test.pl b/tools/build/modules-test.pl
index 1c8239b..3d70fcf 100644
--- a/tools/build/modules-test.pl
+++ b/tools/build/modules-test.pl
@@ -31,7 +31,7 @@ while (<>) {
 		);
 
 		# Show the command that's going to be ran, for debugging purposes
-		print "@cmd\n";
+		print "[" . getcwd . "] @cmd\n";
 
 		# Actually run the command
 		my $exit = system "@cmd";
-- 
cgit v1.1


From ee9f3d495da01bc6d43e906c01b1ef5a5b8bc762 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 5 Dec 2019 22:31:20 +0100
Subject: Use -utils to get prove

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8c68ef..be33ba3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,7 @@ Community Modules:
   stage: Test
   image: alpine:latest
   before_script:
-    - apk add --no-cache build-base openssl-dev perl perl-test-harness readline-dev
+    - apk add --no-cache build-base openssl-dev perl perl-test-harness-utils readline-dev
     - cd -- "work/build/rakudo-star-$CI_COMMIT_REF_NAME"
   script:
     - make verbose-modules-test
-- 
cgit v1.1


From 08eca0b69dc4ac7d9c2c0e012d441899298ca70c Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 5 Dec 2019 23:04:31 +0100
Subject: Don't reinstall modules for testing

---
 tools/build/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index 9befd0c..5ce58e2 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/Makefile.in
@@ -67,12 +67,12 @@ modules-install-m: rakudo-install
 modules-test: @backend_modules_test@
 verbose-modules-test: @backend_modules_test@
 
-modules-test-j: modules-install-j
+modules-test-j:
 	$(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_J_INSTALL) $(MODULES)
 verbose-modules-test-j: modules-install-j
 	$(PERL) tools/build/modules-test.pl --verbose $(CURDIR) $(DESTDIR)$(PERL6_J_INSTALL) $(MODULES)
 
-modules-test-m: modules-install-m
+modules-test-m:
 	$(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_M_INSTALL) $(MODULES)
 verbose-modules-test-m: modules-install-m
 	$(PERL) tools/build/modules-test.pl --verbose $(CURDIR) $(DESTDIR)$(PERL6_M_INSTALL) $(MODULES)
-- 
cgit v1.1


From 6e8c904bbf0ad34b21e645897490de5ebc405d2a Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Thu, 5 Dec 2019 23:09:57 +0100
Subject: Make perl6 available during module testing

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be33ba3..22bdad8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,8 +58,8 @@ Debug Test:
   stage: Test
   image: alpine:latest
   before_script:
-    - apk add --no-cache build-base git perl
     - export PATH="$CI_PROJECT_DIR/work/install/bin:$CI_PROJECT_DIR/work/install/share/perl6/site/bin:$PATH"
+    - apk add --no-cache build-base git perl
   script:
     - sh "$CI_PROJECT_DIR/dev-bin/ci-debug.sh"
 
@@ -67,6 +67,7 @@ Community Modules:
   stage: Test
   image: alpine:latest
   before_script:
+    - export PATH="$CI_PROJECT_DIR/work/install/bin:$CI_PROJECT_DIR/work/install/share/perl6/site/bin:$PATH"
     - apk add --no-cache build-base openssl-dev perl perl-test-harness-utils readline-dev
     - cd -- "work/build/rakudo-star-$CI_COMMIT_REF_NAME"
   script:
-- 
cgit v1.1