Skip to content

Commit a7812f6

Browse files
committed
Add curl
Signed-off-by: apostasie <[email protected]>
1 parent c43a038 commit a7812f6

File tree

1 file changed

+34
-5
lines changed

1 file changed

+34
-5
lines changed

Diff for: .github/workflows/test-images-build.yml

+34-5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ env:
1414
REGISTRY: ghcr.io
1515
BUSYBOX_VERSION: 5ad83957fa74aafd061afbfb8da14ce3220659a9
1616
REGISTRY_VERSION: v2.8.3
17+
CURL_VERSION: 8.11.0_4
1718

1819
jobs:
1920
build-busybox:
@@ -25,7 +26,7 @@ jobs:
2526
with:
2627
path: busybox.exe
2728
enableCrossOsArchive: true
28-
key: cache-busybox-${{ env.BUSYBOX_VERSION }}-a
29+
key: cache-busybox-${{ env.BUSYBOX_VERSION }}
2930
- uses: actions/checkout@v4
3031
if: steps.cache-busybox.outputs.cache-hit != 'true'
3132
with:
@@ -43,6 +44,24 @@ jobs:
4344
cd -
4445
cp ./src/busybox-w32/busybox.exe .
4546
47+
build-curl:
48+
name: busybox
49+
runs-on: ubuntu-24.04
50+
steps:
51+
- id: cache-curl
52+
uses: actions/cache@v4
53+
with:
54+
path: curl.exe
55+
enableCrossOsArchive: true
56+
key: cache-curl-${{ env.CURL_VERSION }}
57+
- name: ""
58+
if: steps.cache-curl.outputs.cache-hit != 'true'
59+
run: |
60+
curl -fsSL https://curl.se/windows/dl-${CURL_VERSION}/curl-${CURL_VERSION}-win64-mingw.zip
61+
unzip curl-${CURL_VERSION}-win64-mingw.zip
62+
cp ./curl-${CURL_VERSION}-win64-mingw/bin/curl.exe .
63+
64+
4665
build-registry:
4766
name: registry
4867
runs-on: ubuntu-24.04
@@ -52,7 +71,7 @@ jobs:
5271
with:
5372
path: build
5473
enableCrossOsArchive: true
55-
key: cache-registry-${{ env.REGISTRY_VERSION }}-a
74+
key: cache-registry-${{ env.REGISTRY_VERSION }}
5675
- uses: actions/checkout@v4
5776
if: steps.cache-registry.outputs.cache-hit != 'true'
5877
with:
@@ -82,7 +101,9 @@ jobs:
82101
image-busybox:
83102
name: image-busybox
84103
runs-on: windows-2022
85-
needs: build-busybox
104+
needs:
105+
- build-busybox
106+
- build-curl
86107
defaults:
87108
run:
88109
shell: bash
@@ -92,7 +113,14 @@ jobs:
92113
with:
93114
path: busybox.exe
94115
enableCrossOsArchive: true
95-
key: cache-busybox-${{ env.BUSYBOX_VERSION }}-a
116+
key: cache-busybox-${{ env.BUSYBOX_VERSION }}
117+
fail-on-cache-miss: true
118+
- uses: actions/cache/restore@v4
119+
id: cache-curl
120+
with:
121+
path: curl.exe
122+
enableCrossOsArchive: true
123+
key: cache-curl-${{ env.CURL_VERSION }}
96124
fail-on-cache-miss: true
97125
- name: "Prep busybox image"
98126
run: |
@@ -102,6 +130,7 @@ jobs:
102130
RUN mkdir C:\\tmp
103131
RUN mkdir C:\\bin
104132
COPY busybox.exe C:/bin/
133+
COPY curl.exe C:/bin/
105134
ENV PATH="C:\\bin;\$WindowsPATH;C:\\Windows\\System32"
106135
# FIXME: does not work for some reason
107136
# RUN setx /M PATH "C:\\bin;%PATH%"
@@ -127,7 +156,7 @@ jobs:
127156
with:
128157
path: build
129158
enableCrossOsArchive: true
130-
key: cache-registry-${{ env.REGISTRY_VERSION }}-a
159+
key: cache-registry-${{ env.REGISTRY_VERSION }}
131160
fail-on-cache-miss: true
132161
- name: "Prep registry image"
133162
run: |

0 commit comments

Comments
 (0)