Skip to content

Commit 8c2d66a

Browse files
authored
Update curl-for-win.yml
1 parent bc62c14 commit 8c2d66a

1 file changed

Lines changed: 38 additions & 11 deletions

File tree

.github/workflows/curl-for-win.yml

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,39 @@ jobs:
6363
export CW_GCCSUFFIX='-12'
6464
sudo podman image trust set --type reject default
6565
sudo podman image trust set --type accept docker.io/library
66-
time podman pull "${DOCKER_IMAGE_STABLE}"
66+
time podman pull "${OCI_IMAGE_DEBIAN_STABLE}"
6767
podman images --digests
6868
time podman run --volume "$(pwd):$(pwd)" --workdir "$(pwd)" \
6969
--env-file <(env | grep -a -E \
7070
'^(CW_|GITHUB_)') \
71-
"${DOCKER_IMAGE_STABLE}" \
71+
"${OCI_IMAGE_DEBIAN_STABLE}" \
72+
sh -c ./_ci-linux-debian.sh
73+
74+
linux-glibc-gcc-minimal: # use gcc to minimize installed packages
75+
name: 'Linux gcc glibc minimal'
76+
runs-on: ubuntu-latest
77+
timeout-minutes: 5
78+
steps:
79+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
80+
with:
81+
persist-credentials: false
82+
path: 'curl'
83+
fetch-depth: 8
84+
- name: 'build'
85+
run: |
86+
git clone --depth 1 https://github.com/curl/curl-for-win
87+
mv curl-for-win/* .
88+
export CW_CONFIG='-main-werror-unitybatch-prefill-zero-osnotls-osnoidn-nohttp-nocurltool-linux-x64-gcc'
89+
export CW_REVISION="${GITHUB_SHA}"
90+
. ./_versions.sh
91+
sudo podman image trust set --type reject default
92+
sudo podman image trust set --type accept docker.io/library
93+
time podman pull "${OCI_IMAGE_DEBIAN}"
94+
podman images --digests
95+
time podman run --volume "$(pwd):$(pwd)" --workdir "$(pwd)" \
96+
--env-file <(env | grep -a -E \
97+
'^(CW_|GITHUB_)') \
98+
"${OCI_IMAGE_DEBIAN}" \
7299
sh -c ./_ci-linux-debian.sh
73100
74101
linux-musl-llvm:
@@ -90,12 +117,12 @@ jobs:
90117
. ./_versions.sh
91118
sudo podman image trust set --type reject default
92119
sudo podman image trust set --type accept docker.io/library
93-
time podman pull "${DOCKER_IMAGE}"
120+
time podman pull "${OCI_IMAGE_DEBIAN}"
94121
podman images --digests
95122
time podman run --volume "$(pwd):$(pwd)" --workdir "$(pwd)" \
96123
--env-file <(env | grep -a -E \
97124
'^(CW_|GITHUB_)') \
98-
"${DOCKER_IMAGE}" \
125+
"${OCI_IMAGE_DEBIAN}" \
99126
sh -c ./_ci-linux-debian.sh
100127
101128
mac-clang:
@@ -137,16 +164,16 @@ jobs:
137164
. ./_versions.sh
138165
sudo podman image trust set --type reject default
139166
sudo podman image trust set --type accept docker.io/library
140-
time podman pull "${DOCKER_IMAGE}"
167+
time podman pull "${OCI_IMAGE_DEBIAN}"
141168
podman images --digests
142169
time podman run --volume "$(pwd):$(pwd)" --workdir "$(pwd)" \
143170
--env-file <(env | grep -a -E \
144171
'^(CW_|GITHUB_)') \
145-
"${DOCKER_IMAGE}" \
172+
"${OCI_IMAGE_DEBIAN}" \
146173
sh -c ./_ci-linux-debian.sh
147174
148-
win-gcc-zlibold-x86:
149-
name: 'Windows gcc zlib-classic (x86)'
175+
win-gcc-zlibold-x64:
176+
name: 'Windows gcc zlib-classic (x64)'
150177
runs-on: ubuntu-latest
151178
timeout-minutes: 10
152179
steps:
@@ -159,15 +186,15 @@ jobs:
159186
run: |
160187
git clone --depth 1 https://github.com/curl/curl-for-win
161188
mv curl-for-win/* .
162-
export CW_CONFIG='-main-werror-unitybatch-win-x86-gcc-zlibng'
189+
export CW_CONFIG='-main-werror-unitybatch-win-x64-gcc-zlibold'
163190
export CW_REVISION="${GITHUB_SHA}"
164191
. ./_versions.sh
165192
sudo podman image trust set --type reject default
166193
sudo podman image trust set --type accept docker.io/library
167-
time podman pull "${DOCKER_IMAGE}"
194+
time podman pull "${OCI_IMAGE_DEBIAN}"
168195
podman images --digests
169196
time podman run --volume "$(pwd):$(pwd)" --workdir "$(pwd)" \
170197
--env-file <(env | grep -a -E \
171198
'^(CW_|GITHUB_)') \
172-
"${DOCKER_IMAGE}" \
199+
"${OCI_IMAGE_DEBIAN}" \
173200
sh -c ./_ci-linux-debian.sh

0 commit comments

Comments
 (0)