From 0abc22f21ae9e4c97d9e8a57f4677c4441bb361e Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 11 Sep 2024 14:59:26 +0200 Subject: [PATCH] Set common curl options via env in workflows Set the common curl options via env var. Signed-off-by: Natanael Copa --- .github/workflows/go.yml | 3 ++- .github/workflows/publish-docs.yml | 3 ++- .github/workflows/release.yml | 11 ++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index c6ee709c940d..7f270e62c472 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -30,6 +30,7 @@ on: env: MAKEFLAGS: -j + CURL_OPTS: --proto =https --tlsv1.2 --retry 5 --retry-all-errors --silent --show-error --location --fail jobs: prepare: @@ -59,7 +60,7 @@ jobs: run: | k0sSortVersion=$(./vars.sh FROM=. k0s_sort_version) mkdir -p build/cache/bin - curl --proto '=https' --tlsv1.2 --retry 5 --retry-all-errors -sSLfo build/cache/bin/k0s_sort "https://github.com/k0sproject/version/releases/download/$k0sSortVersion/k0s_sort-linux-amd64" + curl $CURL_OPTS --output build/cache/bin/k0s_sort "https://github.com/k0sproject/version/releases/download/$k0sSortVersion/k0s_sort-linux-amd64" chmod +x build/cache/bin/k0s_sort export PATH="$(realpath build/cache/bin):$PATH" diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index 5d08761ab446..f1e9d805ee91 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -9,6 +9,7 @@ on: env: MAKEFLAGS: -j + CURL_OPTS: --proto =https --tlsv1.2 --retry 5 --retry-all-errors --silent --show-error --location --fail jobs: build: @@ -38,7 +39,7 @@ jobs: k0sSortVersion=$(./vars.sh FROM=. k0s_sort_version) mkdir -p build/cache/bin - curl --proto '=https' --tlsv1.2 --retry 5 --retry-all-errors -sSLfo build/cache/bin/k0s_sort --retry 5 --retry-all-errors "https://github.com/k0sproject/version/releases/download/$k0sSortVersion/k0s_sort-linux-amd64" + curl $CURL_OPTS --output build/cache/bin/k0s_sort "https://github.com/k0sproject/version/releases/download/$k0sSortVersion/k0s_sort-linux-amd64" chmod +x build/cache/bin/k0s_sort printf '%s\n' "$(realpath build/cache/bin)" >>"$GITHUB_PATH" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 84cb651cc6a5..15d3220c10fb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,7 @@ on: env: MAKEFLAGS: -j + CURL_OPTS: --proto =https --tlsv1.2 --retry 5 --retry-all-errors --silent --show-error --location --fail jobs: release: @@ -100,7 +101,7 @@ jobs: COSIGN_KEY: ${{ secrets.COSIGN_KEY }} COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }} run: | - curl --proto '=https' --tlsv1.2 --retry 5 --retry-all-errors -sSLfo cosign https://github.com/sigstore/cosign/releases/download/v2.3.0/cosign-linux-amd64 + curl $CURL_OPTS --output cosign https://github.com/sigstore/cosign/releases/download/v2.3.0/cosign-linux-amd64 chmod +x ./cosign COSIGN_KEY="$(printf %s "$COSIGN_KEY" | base64 -d)" ./cosign sign-blob --key env://COSIGN_KEY --tlog-upload=false --output-file=k0s.sig k0s cat k0s.sig @@ -192,7 +193,7 @@ jobs: COSIGN_KEY: ${{ secrets.COSIGN_KEY }} COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }} run: | - curl --proto '=https' --tlsv1.2 --retry 5 --retry-all-errors -sSLfo cosign https://github.com/sigstore/cosign/releases/download/v2.3.0/cosign-linux-amd64 + curl $CURL_OPTS --output cosign https://github.com/sigstore/cosign/releases/download/v2.3.0/cosign-linux-amd64 chmod +x ./cosign COSIGN_KEY="$(printf %s "$COSIGN_KEY" | base64 -d)" ./cosign sign-blob --key env://COSIGN_KEY --tlog-upload=false --output-file=k0s.exe.sig k0s.exe cat k0s.exe.sig @@ -260,7 +261,7 @@ jobs: COSIGN_KEY: ${{ secrets.COSIGN_KEY }} COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }} run: | - curl --proto '=https' --tlsv1.2 --retry 5 --retry-all-errors -sSLfo cosign https://github.com/sigstore/cosign/releases/download/v2.3.0/cosign-linux-arm64 + curl $CURL_OPTS --output cosign https://github.com/sigstore/cosign/releases/download/v2.3.0/cosign-linux-arm64 chmod +x ./cosign COSIGN_KEY="$(printf %s "$COSIGN_KEY" | base64 -d)" ./cosign sign-blob --key env://COSIGN_KEY --tlog-upload=false --output-file=k0s.sig k0s cat k0s.sig @@ -347,7 +348,7 @@ jobs: COSIGN_KEY: ${{ secrets.COSIGN_KEY }} COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }} run: | - curl --proto '=https' --tlsv1.2 --retry 5 --retry-all-errors -sSLfo cosign https://github.com/sigstore/cosign/releases/download/v2.3.0/cosign-linux-arm + curl $CURL_OPTS --output cosign https://github.com/sigstore/cosign/releases/download/v2.3.0/cosign-linux-arm chmod +x ./cosign COSIGN_KEY="$(printf %s "$COSIGN_KEY" | base64 -d)" ./cosign sign-blob --key env://COSIGN_KEY --tlog-upload=false --output-file=k0s.sig k0s cat k0s.sig @@ -601,7 +602,7 @@ jobs: - name: Create k0s Cluster using k0sctl run: | # download k0sctl - curl --proto '=https' --tlsv1.2 --retry 5 --retry-all-errors -sSLfo k0sctl "https://github.com/k0sproject/k0sctl/releases/download/${K0SCTL_VERSION}/k0sctl-linux-x64" + curl $CURL_OPTS --output k0sctl "https://github.com/k0sproject/k0sctl/releases/download/${K0SCTL_VERSION}/k0sctl-linux-x64" chmod +x ./k0sctl ./k0sctl apply -c k0sctl.yaml