Skip to content

Commit 832f13b

Browse files
committed
attempts a new workaround for get.helm.sh github actions SSL issue
y-bin-download does not recognize symlinks but hopefully this fix is detected by y-helm as already downloaded
1 parent a529379 commit 832f13b

File tree

2 files changed

+20
-12
lines changed

2 files changed

+20
-12
lines changed

bin/y-bin.runner.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
# NOTE yq must be first in the file because this script depends on it
99
yq:
10-
version: 4.44.3
10+
version: 4.44.6
1111
sha256:
12-
darwin_amd64: 216ddfa03e7ba0e5aba00b236ec78324b5bfc49b610db254fe92310878baea20
13-
darwin_arm64: 559a594ef7a6ebc5b81a67b7717fb3accedd266d8fa7d8352da7fec9e463f48b
14-
linux_amd64: a2c097180dd884a8d50c956ee16a9cec070f30a7947cf4ebf87d5f36213e9ed7
15-
linux_arm64: 0e7e1524f68d91b3ff9b089872d185940ab0fa020a5a9052046ef10547023156
12+
darwin_amd64: 71813c67f87766a532a072d9ef9c24dd5615f6b7d2e49b2a56cd26cf3de021e1
13+
darwin_arm64: 164e10e5f7df62990e4f3823205e7ea42ba5660523a428df07c7386c0b62e3d9
14+
linux_amd64: 0c2b24e645b57d8e7c0566d18643a6d4f5580feeea3878127354a46f2a1e4598
15+
linux_arm64: 9477ac3cc447b6c083986129e35af8122eb2b938fe55c9c3e40436fb966e5813
1616
templates:
1717
download: https://github.com/mikefarah/yq/releases/download/v${version}/yq_${os}_${arch}
1818
# Must be parsed based on: https://github.com/mikefarah/yq/releases/download/v${version}/checksums_hashes_order
@@ -68,15 +68,15 @@ skaffold:
6868
linux_arm64: df3ca1d83a4be9b7f4795de4470c8274a8420563d2d0d40fbcafbc92bd1b6c8e
6969

7070
helm:
71-
version: 3.16.2
71+
version: 3.16.3
7272
templates:
7373
download: https://get.helm.sh/helm-v${version}-${os}-${arch}.tar.gz
7474
sha256: https://get.helm.sh/helm-v${version}-${os}-${arch}.tar.gz.sha256sum
7575
sha256:
76-
darwin_amd64: 33efd48492f2358a49a231873e8baf41f702b5ab059333ae9c31e5517633c16e
77-
darwin_arm64: 56413c7fbb496d2789881039cab61d849727c7b35db00826fae7a2685a403344
78-
linux_amd64: 9318379b847e333460d33d291d4c088156299a26cd93d570a7f5d0c36e50b5bb
79-
linux_arm64: 1888301aeb7d08a03b6d9f4d2b73dcd09b89c41577e80e3455c113629fc657a4
76+
darwin_amd64: 495d75b404a96fb664f1ca3f8cb01db2210aacc62dbfa1bbab30916abbb20a57
77+
darwin_arm64: 3a39f690173086e6eea17674751eb3c8b970c02697e49cecd4093eaa3cf89dcd
78+
linux_amd64: f5355c79190951eed23c5432a3b920e071f4c00a64f75e077de0dd4cb7b294ea
79+
linux_arm64: 5bd34ed774df6914b323ff84a0a156ea6ff2ba1eaf0113962fa773f3f9def798
8080
archive:
8181
tool: tar
8282
path: ${os}-${arch}/helm

runner.Dockerfile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,18 @@ RUN set -ex; \
1010
\
1111
export DEBIAN_FRONTEND=noninteractive; \
1212
runDeps='ca-certificates curl git jq unzip findutils patch xz-utils'; \
13-
buildDeps=''; \
13+
buildDeps='gpg apt-transport-https'; \
1414
apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends; \
1515
\
16-
echo disabled: apt-get purge -y --auto-remove $buildDeps; \
16+
echo "workaround for y-helm failing in github actions due to get.helm.sh SSL error"; \
17+
curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | tee /usr/share/keyrings/helm.gpg > /dev/null; \
18+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | tee /etc/apt/sources.list.d/helm-stable-debian.list; \
19+
apt-get update && apt-get install -y helm --no-install-recommends; \
20+
apt_helm_version=$(/usr/bin/helm version --template '{{.Version}}'); \
21+
mkdir -p /usr/local/src/ystack/bin && cp -av /usr/bin/helm /usr/local/src/ystack/bin/y-helm-${apt_helm_version}-bin; \
22+
ln -s /usr/local/src/ystack/bin/y-helm-${apt_helm_version}-bin /usr/local/src/ystack/bin/helm; \
23+
\
24+
apt-get purge -y --auto-remove $buildDeps helm; \
1725
rm -rf /var/lib/apt/lists/*; \
1826
rm -rf /var/log/dpkg.log /var/log/alternatives.log /var/log/apt /root/.gnupg
1927

0 commit comments

Comments
 (0)