Skip to content

Commit fd70877

Browse files
mohawk2mohawk2
committed
remove unnecessary ::group stuff
1 parent dba2bb0 commit fd70877

File tree

19 files changed

+109
-263
lines changed

19 files changed

+109
-263
lines changed

‎github-actions/build-dzil-dist/action.yml‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,43 +9,28 @@ runs:
99
path: ~/perl5
1010
- name: Check for dist.ini
1111
shell: bash
12-
run: |
13-
echo "::group::Check for dist.ini"
14-
[ -f "dist.ini" ]
15-
echo "::endgroup::"
12+
run: [ -f "dist.ini" ]
1613
- name: Perl version
1714
shell: bash
18-
run: |
19-
echo "::group::Perl version"
20-
perl -v
21-
echo "::endgroup::"
15+
run: perl -v
2216
- name: Install cpanm
2317
shell: bash
24-
run: |
25-
echo "::group::Install cpanm"
26-
curl -L https://cpanmin.us | perl - --sudo App::cpanminus
27-
echo "::endgroup::"
18+
run: curl -L https://cpanmin.us | perl - --sudo App::cpanminus
2819
- name: Install local::lib
2920
shell: bash
3021
run: |
31-
echo "::group::Install local::lib"
3222
(cpanm --local-lib=~/perl5 local::lib || ( cat ~/.cpanm/build.log && false )) && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
33-
echo "::endgroup::"
3423
- name: Install Dist::Zilla
3524
shell: bash
3625
run: |
37-
echo "::group::Install Dist::Zilla"
3826
eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
3927
cpanm -n Dist::Zilla || ( cat ~/.cpanm/build.log && false )
4028
(dzil authordeps --missing | cpanm -n) || ( cat ~/.cpanm/build.log && false )
41-
echo "::endgroup::"
4229
- name: Make distribution
4330
shell: bash
4431
run: |
45-
echo "::group::Make distribution"
4632
eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
4733
dzil build --in build-dir
48-
echo "::endgroup::"
4934
- name: Upload artifact
5035
uses: actions/upload-artifact@v4
5136
with:

‎github-actions/build-eumm-dist/action.yml‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,45 +15,30 @@ runs:
1515
path: ~/perl5
1616
- name: Check for Makefile.PL
1717
shell: bash
18-
run: |
19-
echo "::group::Check for Makefile.PL"
20-
[ -f "Makefile.PL" ]
21-
echo "::endgroup::"
18+
run: [ -f "Makefile.PL" ]
2219
- name: Perl version
2320
shell: bash
24-
run: |
25-
echo "::group::Perl version"
26-
perl -v
27-
echo "::endgroup::"
21+
run: perl -v
2822
- name: Install cpanm
2923
shell: bash
30-
run: |
31-
echo "::group::Install cpanm"
32-
curl -L https://cpanmin.us | perl - --sudo App::cpanminus
33-
echo "::endgroup::"
24+
run: curl -L https://cpanmin.us | perl - --sudo App::cpanminus
3425
- name: Install local::lib
3526
shell: bash
3627
run: |
37-
echo "::group::Install local::lib"
3828
(cpanm --local-lib=~/perl5 local::lib || ( cat ~/.cpanm/build.log && false )) && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
39-
echo "::endgroup::"
4029
- name: Install ExtUtils::MakeMaker and configure deps
4130
shell: bash
4231
run: |
43-
echo "::group::Install ExtUtils::MakeMaker"
4432
eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
4533
cpanm -n ExtUtils::MakeMaker || ( cat ~/.cpanm/build.log && false )
4634
if [ -n "${{ inputs.dist-perl-deps-configure }}" ]; then
4735
cpanm --dev -n ${{ inputs.dist-perl-deps-configure }} || ( cat ~/.cpanm/build.log && false )
4836
fi
49-
echo "::endgroup::"
5037
- name: Make distribution
5138
shell: bash
5239
run: |
53-
echo "::group::Make distribution"
5440
eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
5541
perl Makefile.PL && make distdir DISTVNAME=build-dir
56-
echo "::endgroup::"
5742
- name: Upload artifact
5843
uses: actions/upload-artifact@v4
5944
with:

‎github-actions/install-dep-eumm-blead/action.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,4 @@ runs:
44
steps:
55
- name: Install ExtUtils::MakeMaker blead
66
shell: bash
7-
run: |
8-
echo "::group::Install ExtUtils::MakeMaker blead (via cpanm)"
9-
cpanm -n --dev ExtUtils::MakeMaker || ( cat ~/.cpanm/build.log && false )
10-
echo "::endgroup::"
11-
7+
run: cpanm -n --dev ExtUtils::MakeMaker || ( cat ~/.cpanm/build.log && false )

‎github-actions/install-dep-fftw3/action.yml‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,16 @@ runs:
44
steps:
55
- name: Install FFTW3 (via apt-get)
66
shell: bash
7-
run: |
8-
if ${{ toJSON( runner.os == 'Linux' ) }}; then
9-
echo "::group::Install FFTW3 (via apt-get)"
10-
sudo apt-get -y update && sudo apt-get install --no-install-recommends -y libfftw3-dev
11-
echo "::endgroup::"
12-
fi
7+
if: runner.os == 'Linux'
8+
run: sudo apt-get -y update && sudo apt-get install --no-install-recommends -y libfftw3-dev
139
- name: Install FFTW3 (via brew)
1410
shell: bash
15-
run: |
16-
if ${{ toJSON( runner.os == 'macOS' ) }}; then
17-
echo "::group::Install FFTW3 (via brew)"
18-
brew install fftw
19-
echo "::endgroup::"
20-
fi
11+
if: runner.os == 'macOS'
12+
run: brew install fftw
2113
- name: Install FFTW3 (via Alien::FFTW3)
2214
shell: bash
15+
if: runner.os == 'Windows'
2316
run: |
24-
if ${{ toJSON( runner.os == 'Windows' ) }}; then
25-
echo "::group::Install FFTW3 (via Alien::FFTW3 TODO)"
26-
# TODO Alien::FFTW3 does not have build support for MSWin32 yet
27-
#$MYPERL -S cpanm -n Module::Build || ( cat ~/.cpanm/build.log && false )
28-
#$MYPERL -S cpanm -n Alien::FFTW3 || ( cat ~/.cpanm/build.log && false )
29-
echo "::endgroup::"
30-
fi
17+
# TODO Alien::FFTW3 does not have build support for MSWin32 yet
18+
#$MYPERL -S cpanm -n Module::Build || ( cat ~/.cpanm/build.log && false )
19+
#$MYPERL -S cpanm -n Alien::FFTW3 || ( cat ~/.cpanm/build.log && false )

‎github-actions/install-dep-gd/action.yml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,9 @@ runs:
44
steps:
55
- name: Install GD (via apt-get)
66
shell: bash
7-
run: |
8-
if ${{ toJSON( runner.os == 'Linux' ) }}; then
9-
echo "::group::Install GD (via apt-get)"
10-
sudo apt-get -y update && sudo apt-get install --no-install-recommends -y libgd-dev
11-
echo "::endgroup::"
12-
fi
7+
if: runner.os == 'Linux'
8+
run: sudo apt-get -y update && sudo apt-get install --no-install-recommends -y libgd-dev
139
- name: Install GD (via brew)
1410
shell: bash
15-
run: |
16-
if ${{ toJSON( runner.os == 'macOS' ) }}; then
17-
echo "::group::Install GD (via brew)"
18-
brew install gd
19-
echo "::endgroup::"
20-
fi
11+
if: runner.os == 'macOS'
12+
run: brew install gd

‎github-actions/install-dep-gfortran/action.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,4 @@ runs:
55
- uses: PDLPorters/devops/github-actions/install-gfortran@master
66
- name: Install ExtUtils::F77
77
shell: bash
8-
run: |
9-
echo "::group::Install ExtUtils::F77 (via cpanm)"
10-
$MYPERL -S cpanm -n ExtUtils::F77 || ( cat ~/.cpanm/build.log && false )
11-
echo "::endgroup::"
8+
run: $MYPERL -S cpanm -n ExtUtils::F77 || ( cat ~/.cpanm/build.log && false )

‎github-actions/install-dep-gnuplot/action.yml‎

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,27 @@ runs:
44
steps:
55
- name: Install gnuplot (via apt-get)
66
shell: bash
7-
run: |
8-
if ${{ toJSON( runner.os == 'Linux' ) }}; then
9-
echo "::group::Install gnuplot (via apt-get)"
10-
sudo apt-get -y update && sudo apt-get install --no-install-recommends -y gnuplot gnuplot-qt
11-
echo "::endgroup::"
12-
fi
7+
if: runner.os == 'Linux'
8+
run: sudo apt-get -y update && sudo apt-get install --no-install-recommends -y gnuplot gnuplot-qt
139
- name: Install gnuplot (via brew)
1410
shell: bash
11+
if: runner.os == 'macOS'
1512
run: |
16-
if ${{ toJSON( runner.os == 'macOS' ) }}; then
17-
echo "::group::Install gnuplot (via brew)"
18-
brew update
19-
brew upgrade python || true # currently (2024-03-25) 3.12 link fails
20-
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install gnuplot
21-
echo "::endgroup::"
22-
fi
13+
brew update
14+
brew upgrade python || true # currently (2024-03-25) 3.12 link fails
15+
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install gnuplot
2316
- name: Install gnuplot (extract from archive)
2417
shell: bash
18+
if: runner.os == 'Windows'
2519
env:
2620
GNUPLOT_URI: "https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.6/gp546-win64-mingw-2.7z/download"
2721
GNUPLOT_FILE: "gp546-win64-mingw-2.7z"
2822
run: |
29-
if ${{ toJSON( runner.os == 'Windows' ) }}; then
30-
echo "::group::Install gnuplot (extract from archive)"
31-
num_attempts=1
32-
until \
33-
pwsh -c ' [Net.ServicePointManager]::SecurityProtocol = "tls12, tls11, tls"; $request = Invoke-WebRequest -MaximumRetryCount 3 -UserAgent Curl -Uri $Env:GNUPLOT_URI -OutFile $Env:GNUPLOT_FILE' \
34-
|| [[ $num_attempts -gt 3 ]]; do
35-
echo $((num_attempts++));
36-
done
37-
7z x $GNUPLOT_FILE -o..
38-
pwsh -c 'echo "'$( cygpath -w $( realpath ../gnuplot/bin ) )'" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append'
39-
echo "::endgroup::"
40-
fi
23+
num_attempts=1
24+
until \
25+
pwsh -c ' [Net.ServicePointManager]::SecurityProtocol = "tls12, tls11, tls"; $request = Invoke-WebRequest -MaximumRetryCount 3 -UserAgent Curl -Uri $Env:GNUPLOT_URI -OutFile $Env:GNUPLOT_FILE' \
26+
|| [[ $num_attempts -gt 3 ]]; do
27+
echo $((num_attempts++));
28+
done
29+
7z x $GNUPLOT_FILE -o..
30+
pwsh -c 'echo "'$( cygpath -w $( realpath ../gnuplot/bin ) )'" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append'

‎github-actions/install-dep-gsl/action.yml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,9 @@ runs:
44
steps:
55
- name: Install GSL (via apt-get)
66
shell: bash
7-
run: |
8-
if ${{ toJSON( runner.os == 'Linux' ) }}; then
9-
echo "::group::Install GSL (via apt-get)"
10-
sudo apt-get -y update && sudo apt-get install --no-install-recommends -y libgsl0-dev
11-
echo "::endgroup::"
12-
fi
7+
if: runner.os == 'Linux'
8+
run: sudo apt-get -y update && sudo apt-get install --no-install-recommends -y libgsl0-dev
139
- name: Install GSL (via brew)
1410
shell: bash
15-
run: |
16-
if ${{ toJSON( runner.os == 'macOS' ) }}; then
17-
echo "::group::Install GSL (via brew)"
18-
brew install gsl
19-
echo "::endgroup::"
20-
fi
11+
if: runner.os == 'macOS'
12+
run: brew install gsl

‎github-actions/install-dep-hdf4/action.yml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,10 @@ runs:
44
steps:
55
- name: Install HDF4 (via apt-get)
66
shell: bash
7-
run: |
8-
if ${{ toJSON( runner.os == 'Linux' ) }}; then
9-
echo "::group::Install HDF4 (via apt-get)"
10-
sudo apt-get -y update && sudo apt-get install --no-install-recommends -y libhdf4-alt-dev
11-
echo "::endgroup::"
12-
fi
7+
if: runner.os == 'Linux'
8+
run: sudo apt-get -y update && sudo apt-get install --no-install-recommends -y libhdf4-alt-dev
139
# formula is broken as of 2024-12-03 "no formula szip"
1410
# - name: Install HDF4 (via brew)
1511
# shell: bash
16-
# run: |
17-
# if ${{ toJSON( runner.os == 'macOS' ) }}; then
18-
# echo "::group::Install HDF4 (via brew)"
19-
# brew install brewsci/science/hdf4
20-
# echo "::endgroup::"
21-
# fi
12+
# if: runner.os == 'macOS'
13+
# run: brew install brewsci/science/hdf4

‎github-actions/install-dep-hdf5/action.yml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,9 @@ runs:
44
steps:
55
- name: Install HDF5 (via apt-get)
66
shell: bash
7-
run: |
8-
if ${{ toJSON( runner.os == 'Linux' ) }}; then
9-
echo "::group::Install HDF5 (via apt-get)"
10-
sudo apt-get -y update && sudo apt-get install --no-install-recommends -y libhdf5-dev
11-
echo "::endgroup::"
12-
fi
7+
if: runner.os == 'Linux'
8+
run: sudo apt-get -y update && sudo apt-get install --no-install-recommends -y libhdf5-dev
139
- name: Install HDF5 (via brew)
1410
shell: bash
15-
run: |
16-
if ${{ toJSON( runner.os == 'macOS' ) }}; then
17-
echo "::group::Install HDF5 (via brew)"
18-
brew install hdf5
19-
echo "::endgroup::"
20-
fi
11+
if: runner.os == 'macOS'
12+
run: brew install hdf5

0 commit comments

Comments
 (0)