Author: richter
Date: Sat Sep 23 22:04:23 2023
New Revision: 1912494
URL: http://svn.apache.org/viewvc?rev=1912494&view=rev
Log:
Add amazonlinux to gitlab CI
Modified:
perl/embperl/trunk/.gitlab-ci.d/build-container.yml
perl/embperl/trunk/.gitlab-ci.yml
Modified: perl/embperl/trunk/.gitlab-ci.d/build-container.yml
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/.gitlab-ci.d/build-container.yml?rev=1912494&r1=1912493&r2=1912494&view=diff
==============================================================================
--- perl/embperl/trunk/.gitlab-ci.d/build-container.yml (original)
+++ perl/embperl/trunk/.gitlab-ci.d/build-container.yml Sat Sep 23 22:04:23 2023
@@ -24,7 +24,12 @@ container-$[[ inputs.imagename ]]-$[[ in
dnf --enablerepo=epel -y install mod_perl-devel
perl-Apache-Session perl-ExtUtils-PkgConfig || exit 1
cpan LWP::UserAgent || exit 1
else
- yum -y install mod_perl-devel perl-Apache-Session
perl-ExtUtils-PkgConfig || exit 1
+ if egrep 'Amazon Linux' /etc/os-release
+ then
+ yum -y install mod_perl-devel perl-ExtUtils-PkgConfig ||
exit 1
+ else
+ yum -y install mod_perl-devel perl-Apache-Session
perl-ExtUtils-PkgConfig || exit 1
+ fi
fi
cpan LWP::UserAgent || exit 1
cpan ExtUtils::XSBuilder || exit 2
@@ -48,7 +53,7 @@ container-$[[ inputs.imagename ]]-$[[ in
#- env | sort
script:
- pwd
- - docker build . -t ep_$[[ inputs.imagename ]]:$[[ inputs.imagetag ]]
+ - docker build . --force-rm -t ep_$[[ inputs.imagename ]]:$[[
inputs.imagetag ]]
build-offline-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]:
stage: build
@@ -63,6 +68,7 @@ build-offline-$[[ inputs.imagename ]]-$[
- perl xsbuilder/xs_generate.pl
- APACHE_SRC=- perl Makefile.PL
- make
+ - ls --full-time Makefile*
test-offline-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]:
needs: ["build-offline-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]"]
@@ -71,6 +77,7 @@ test-offline-$[[ inputs.imagename ]]-$[[
pull_policy: never
stage: test
script:
+ - ls --full-time Makefile*
- make test
build-apache-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]:
@@ -86,6 +93,7 @@ build-apache-$[[ inputs.imagename ]]-$[[
- perl xsbuilder/xs_generate.pl
- perl Makefile.PL
- make
+ - ls --full-time Makefile*
test-apache-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]:
needs: ["build-apache-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]"]
@@ -94,4 +102,5 @@ test-apache-$[[ inputs.imagename ]]-$[[
pull_policy: never
stage: test
script:
+ - ls --full-time Makefile*
- make test
\ No newline at end of file
Modified: perl/embperl/trunk/.gitlab-ci.yml
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/.gitlab-ci.yml?rev=1912494&r1=1912493&r2=1912494&view=diff
==============================================================================
--- perl/embperl/trunk/.gitlab-ci.yml (original)
+++ perl/embperl/trunk/.gitlab-ci.yml Sat Sep 23 22:04:23 2023
@@ -34,5 +34,5 @@ include:
- local: .gitlab-ci.d/build-container.yml
inputs:
imagename: amazonlinux
- imagetag: "2"
+ imagetag: "2023"
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org
For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
