Skip to content

Commit 3b6fd9e

Browse files
authored
change a bit the curl retry to support ubuntu 20.04 (#19)
1 parent 5932fdb commit 3b6fd9e

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.github/workflows/test-local-action.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
version: ["1.7.0", "1.8.2", "1.9.0", "1.10.0", "1.11.0", "latest"]
17-
runs-on: ubuntu-latest
17+
os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-latest ]
18+
runs-on: ${{ matrix.os }}
1819
env:
1920
BATS_LIB_PATH: "/usr/lib"
2021
TERM: xterm
@@ -59,7 +60,8 @@ jobs:
5960
fail-fast: false
6061
matrix:
6162
version: ["1.7.0", "1.8.2", "1.9.0", "1.10.0", "1.11.0", "latest"]
62-
runs-on: ubuntu-latest
63+
os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-latest ]
64+
runs-on: ${{ matrix.os }}
6365
env:
6466
BATS_LIB_PATH: "/usr/lib"
6567
TERM: xterm

action.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,14 @@ runs:
132132
133133
# From https://github.com/fluxcd/flux2/blob/44d69d6fc0c353e79c1bad021a4aca135033bce8/action/action.yml#L35
134134
if [[ -z "$VERSION" ]] || [[ "$VERSION" = "latest" ]]; then
135-
VERSION=$(curl -fsSL --retry 2 --retry-all-errors https://api.github.com/repos/bats-core/bats-core/releases/latest | grep tag_name | cut -d '"' -f 4)
135+
VERSION=$(curl -fsSL --retry 4 --retry-connrefused https://api.github.com/repos/bats-core/bats-core/releases/latest | grep tag_name | cut -d '"' -f 4)
136136
fi
137137
[[ $VERSION = v* ]] && VERSION="${VERSION:1}"
138138
139139
mkdir -p ${TEMPDIR}
140140
mkdir -p ${DESTDIR}
141141
142-
curl -sL --retry 2 --retry-all-errors ${URL}/archive/refs/tags/v${VERSION}.tar.gz | tar xz -C ${TEMPDIR} --strip-components 1 && cd ${TEMPDIR}
142+
curl -sL --retry 4 --retry-connrefused ${URL}/archive/refs/tags/v${VERSION}.tar.gz | tar xz -C ${TEMPDIR} --strip-components 1 && cd ${TEMPDIR}
143143
144144
# Install
145145
./install.sh ${DESTDIR}
@@ -170,7 +170,7 @@ runs:
170170
mkdir -p ${TEMPDIR}
171171
[[ "${DESTDIR}" == "$HOME"* ]] && CMD="" || CMD="sudo"
172172
${CMD} mkdir -p ${DESTDIR}/src/
173-
curl -sL --retry 2 --retry-all-errors ${url} | tar xz -C ${TEMPDIR} --strip-components 1 && cd ${TEMPDIR}
173+
curl -sL --retry 4 --retry-connrefused ${url} | tar xz -C ${TEMPDIR} --strip-components 1 && cd ${TEMPDIR}
174174
# Archlinux style, except that we are not in a fakeroot env
175175
${CMD} install -Dm755 load.bash ${DESTDIR}/load.bash
176176
for fn in src/*.bash; do
@@ -203,7 +203,7 @@ runs:
203203
mkdir -p ${TEMPDIR}
204204
[[ "${DESTDIR}" == "$HOME"* ]] && CMD="" || CMD="sudo"
205205
${CMD} mkdir -p ${DESTDIR}/src/
206-
curl -sL --retry 2 --retry-all-errors ${url} | tar xz -C ${TEMPDIR} --strip-components 1 && cd ${TEMPDIR}
206+
curl -sL --retry 4 --retry-connrefused ${url} | tar xz -C ${TEMPDIR} --strip-components 1 && cd ${TEMPDIR}
207207
# Archlinux style, except that we are not in a fakeroot env
208208
${CMD} install -Dm755 load.bash ${DESTDIR}/load.bash
209209
for fn in src/*.bash; do
@@ -236,7 +236,7 @@ runs:
236236
mkdir -p ${TEMPDIR}
237237
[[ "${DESTDIR}" == "$HOME"* ]] && CMD="" || CMD="sudo"
238238
${CMD} mkdir -p ${DESTDIR}/src/
239-
curl -sL --retry 2 --retry-all-errors ${url} | tar xz -C ${TEMPDIR} --strip-components 1 && cd ${TEMPDIR}
239+
curl -sL --retry 4 --retry-connrefused ${url} | tar xz -C ${TEMPDIR} --strip-components 1 && cd ${TEMPDIR}
240240
# Archlinux style, except that we are not in a fakeroot env so we need to use sudo
241241
for fn in lib/*.bash; do
242242
${CMD} install -Dm755 $fn \
@@ -268,7 +268,7 @@ runs:
268268
mkdir -p ${TEMPDIR}
269269
[[ "${DESTDIR}" == "$HOME"* ]] && CMD="" || CMD="sudo"
270270
${CMD} mkdir -p ${DESTDIR}/src/
271-
curl -sL --retry 2 --retry-all-errors ${url} | tar xz -C ${TEMPDIR} --strip-components 1 && cd ${TEMPDIR}
271+
curl -sL --retry 4 --retry-connrefused ${url} | tar xz -C ${TEMPDIR} --strip-components 1 && cd ${TEMPDIR}
272272
# Archlinux style, except that we are not in a fakeroot env
273273
${CMD} install -Dm755 load.bash ${DESTDIR}/load.bash
274274
for fn in src/*.bash; do

0 commit comments

Comments
 (0)