Skip to content

Commit 15dbe4f

Browse files
committed
Update old Perls from jessie to stretch (and test them all in Actions)
1 parent 738a3cc commit 15dbe4f

File tree

51 files changed

+92
-62
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+92
-62
lines changed

.github/workflows/build-image.yml

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build and test latest supported Perls
1+
name: Build and Test
22

33
on:
44
push:
@@ -8,13 +8,29 @@ on:
88
- '*'
99
pull_request:
1010

11+
defaults:
12+
run:
13+
shell: 'bash -Eeuo pipefail -x {0}'
14+
1115
jobs:
16+
generate-matrix:
17+
name: Generate Matrix
18+
runs-on: ubuntu-latest
19+
outputs:
20+
matrix: ${{ steps.generate.outputs.matrix }}
21+
steps:
22+
- uses: actions/checkout@master
23+
- id: generate
24+
name: Enumerate Dockerfiles
25+
run: |
26+
matrix="$(dirname */Dockerfile | sort -rn | jq -csR 'rtrimstr("\n") | split("\n") | { directory: . }')"
27+
echo "::set-output name=matrix::$matrix"
1228
build-image:
29+
needs: generate-matrix
1330
runs-on: ubuntu-latest
1431
strategy:
15-
matrix:
16-
variant: [ 'main', 'slim', 'main,threaded', 'slim,threaded' ]
17-
perl-version: [ '5.032.001', '5.030.003' ]
32+
matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
33+
name: ${{ matrix.directory }}
1834
steps:
1935
- uses: actions/checkout@master
2036
- name: Clone docker-library/official-images (for testing)
@@ -23,11 +39,17 @@ jobs:
2339
- name: Build image
2440
run: |
2541
docker version
26-
docker build --no-cache -t perl:${{ matrix.perl-version }} ${{ matrix.perl-version }}-${{ matrix.variant }}-buster
42+
dir='${{ matrix.directory }}'
43+
img="perl:${dir//,/-}"
44+
docker build -t "$img" "$dir"
2745
- name: Inspect image creation and tag time
2846
run: |
29-
docker image inspect --format \'{{.Created}}\' perl:${{ matrix.perl-version }}
30-
docker image inspect --format \'{{.Metadata.LastTagTime}}\' perl:${{ matrix.perl-version }}
47+
dir='${{ matrix.directory }}'
48+
img="perl:${dir//,/-}"
49+
docker image inspect --format '{{.Created}}' "$img"
50+
docker image inspect --format '{{.Metadata.LastTagTime}}' "$img"
3151
- name: Run tests
3252
run: |
33-
./official-images/test/run.sh perl:${{ matrix.perl-version }}
53+
dir='${{ matrix.directory }}'
54+
img="perl:${dir//,/-}"
55+
./official-images/test/run.sh "$img"

5.008.009-main,threaded-jessie/Dockerfile renamed to 5.008.009-main,threaded-stretch/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM buildpack-deps:jessie
1+
FROM buildpack-deps:stretch
22
LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <[email protected]>"
33

44
COPY *.patch /usr/src/perl/

5.008.009-main-jessie/Dockerfile renamed to 5.008.009-main-stretch/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM buildpack-deps:jessie
1+
FROM buildpack-deps:stretch
22
LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <[email protected]>"
33

44
COPY *.patch /usr/src/perl/

5.008.009-slim,threaded-jessie/Dockerfile renamed to 5.008.009-slim,threaded-stretch/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:jessie-slim
1+
FROM debian:stretch-slim
22
LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <[email protected]>"
33

44
COPY *.patch /usr/src/perl/

5.008.009-slim-jessie/Dockerfile renamed to 5.008.009-slim-stretch/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:jessie-slim
1+
FROM debian:stretch-slim
22
LABEL maintainer="Peter Martini <[email protected]>, Zak B. Elep <[email protected]>"
33

44
COPY *.patch /usr/src/perl/

0 commit comments

Comments
 (0)