Skip to content

Commit 1aa3eef

Browse files
authored
Merge pull request #153 from mojolicious/fix/gh_actions
Add workaround for git diff issue in perltidy workflow and use updated perl images for all other tests
2 parents 9839a51 + 1ffd30f commit 1aa3eef

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.github/workflows/linux.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ jobs:
1212
strategy:
1313
matrix:
1414
perl-version:
15-
- '5.16'
16-
- '5.18'
17-
- '5.20'
18-
- '5.22'
19-
- '5.30'
20-
- '5.32'
15+
- '5.16-buster'
16+
- '5.18-buster'
17+
- '5.20-buster'
18+
- '5.22-buster'
19+
- '5.30-bullseye'
20+
- '5.32-bullseye'
2121
container:
2222
image: perl:${{ matrix.perl-version }}
2323
steps:
24-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v3
2525
- name: perl -V
2626
run: perl -V
2727
- name: Fix ExtUtils::MakeMaker (for Perl 5.16 and 5.18)

.github/workflows/perltidy.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
container:
1313
image: perl:5.32
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- name: perl -V
1717
run: perl -V
1818
- name: Install dependencies
@@ -23,4 +23,5 @@ jobs:
2323
shell: bash
2424
run: |
2525
shopt -s extglob globstar nullglob
26+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
2627
perltidy --pro=.../.perltidyrc -b -bext='/' **/*.p[lm] **/*.t && git diff --exit-code

lib/Mojolicious/Plugin/AssetPack.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ sub _render_tags {
192192

193193
return Mojo::ByteStream->new(
194194
join "\n",
195-
map { $_->tag_for->($_, $c, \%args, @attrs) }
195+
map { $_->tag_for->($_, $c, \%args, @attrs) }
196196
grep { !$_->isa('Mojolicious::Plugin::AssetPack::Asset::Null') } @$assets
197197
);
198198
}

0 commit comments

Comments
 (0)