diff options
author | tyil <p.spek@tyil.nl> | 2019-12-05 23:50:26 +0000 |
---|---|---|
committer | tyil <p.spek@tyil.nl> | 2019-12-05 23:50:26 +0000 |
commit | bb0f25ff2bf207a8c478559f0b6fa572b3cd6514 (patch) | |
tree | 949a27f98ebbbc7b3c15c2d41aae7cab3b0fe94d | |
parent | 0bd6af6b9ccb4760dc8ac57ed25084ab36668aa8 (diff) | |
parent | 6e8c904bbf0ad34b21e645897490de5ebc405d2a (diff) |
Merge branch '2019.11-rc1' into 'master'
Rakudo Star 2019.11
See merge request tyil/rakudo-star!2
-rw-r--r-- | .gitlab-ci.yml | 9 | ||||
-rw-r--r-- | .gitmodules | 9 | ||||
-rw-r--r-- | Dockerfile | 2 | ||||
m--------- | modules/DBIish | 0 | ||||
m--------- | modules/Encode | 0 | ||||
m--------- | modules/File::Directory::Tree | 0 | ||||
m--------- | modules/JSON::Fast | 0 | ||||
m--------- | modules/LibraryCheck | 0 | ||||
m--------- | modules/License::SPDX | 0 | ||||
m--------- | modules/Linenoise | 0 | ||||
-rw-r--r-- | modules/MODULES.txt | 12 | ||||
m--------- | modules/Readline | 0 | ||||
m--------- | modules/p6doc | 0 | ||||
m--------- | modules/zef | 0 | ||||
-rw-r--r-- | tools/build/Makefile.in | 6 | ||||
-rw-r--r-- | tools/build/module-install.pl | 12 | ||||
-rw-r--r-- | tools/build/modules-test.pl | 49 | ||||
-rw-r--r-- | tools/star/Makefile | 8 |
18 files changed, 75 insertions, 32 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcb0eff..22bdad8 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" @@ -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,10 +67,11 @@ Community Modules: stage: Test image: alpine:latest before_script: - - apk add --no-cache build-base 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 openssl-dev perl perl-test-harness-utils readline-dev - cd -- "work/build/rakudo-star-$CI_COMMIT_REF_NAME" script: - - make modules-test + - make verbose-modules-test Docker: stage: Release diff --git a/.gitmodules b/.gitmodules index 9cd06e3..46597d9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -172,3 +172,12 @@ [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 +[submodule "modules/Encode"] + path = modules/Encode + url = git://github.com/sergot/perl6-encode.git @@ -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/DBIish b/modules/DBIish -Subproject 1131284aa434b630e1ee7bd2602cf5cc73f78c9 +Subproject 496aed3fd2abd5cfc73b910335e090197e81099 diff --git a/modules/Encode b/modules/Encode new file mode 160000 +Subproject 4c7c0e3b4f86216c2dace7855197f1d9086a777 diff --git a/modules/File::Directory::Tree b/modules/File::Directory::Tree -Subproject 25faef927c83eea1b688b5a324d5e11011f7305 +Subproject 12f1ab52191efa38787de26e5a8d4c01a94d03a diff --git a/modules/JSON::Fast b/modules/JSON::Fast -Subproject 3a29ede8ec738b185a71f11b462cbb63bc8b8b7 +Subproject eb6ae0d339ed2441eb9df7758e3e1b6609eb514 diff --git a/modules/LibraryCheck b/modules/LibraryCheck new file mode 160000 +Subproject e713a7f773f3352801bd43d399e3bdcb3baae5f diff --git a/modules/License::SPDX b/modules/License::SPDX -Subproject 6e7d5477a59b364317bee162eb1b00ef8884a25 +Subproject f37cdac8d3177c82ea095a66907331e033152e0 diff --git a/modules/Linenoise b/modules/Linenoise deleted file mode 160000 -Subproject 480fd919b2c082e691c518fd50c19ad8719532b diff --git a/modules/MODULES.txt b/modules/MODULES.txt index ce332f3..3a489b7 100644 --- a/modules/MODULES.txt +++ b/modules/MODULES.txt @@ -43,17 +43,19 @@ 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 IO::Capture::Simple Test::Util::ServerPort -HTTP::Useragent -JSON::RPC # PSGI, HTTP::Useragent +Encode +HTTP::UserAgent # Encode +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 +Subproject 0d380bc191698d09ec0557e773e16ba773088d3 diff --git a/modules/p6doc b/modules/p6doc -Subproject cfa072a239efb33d9517a21534b561cc5f24c99 +Subproject 5bb0e8c8f980f3f31517d5e9df664a23bd1de42 diff --git a/modules/zef b/modules/zef -Subproject 9db010a4f32c4af866832c3979d0fcf5211a64a +Subproject 0484e30ba82f7860b785e2a1d7759379b2c7848 diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 59f9480..5ce58e2 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@ @@ -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) 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 diff --git a/tools/build/modules-test.pl b/tools/build/modules-test.pl index 396f066..3d70fcf 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 "[" . getcwd . "] @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; diff --git a/tools/star/Makefile b/tools/star/Makefile index a1b879a..3744e21 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 @@ -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) |