Skip to content

Commit 31c4e8b

Browse files
committed
ci: create windows-win64 package
1 parent d1b34a4 commit 31c4e8b

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ variables:
7878
- job: build_linux_armhf
7979
- job: build_linux_armel
8080
- job: build_linux_arm64
81-
- job: build_windows
81+
- job: build_windows_win32
82+
- job: build_windows_win64
8283
- job: macos_codesign
8384

8485
.release_submit_action: &release_submit_action

.gitlab/ci/build.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ build_linux_arm64:
244244
PLATFORM_NAME: "linux-arm64"
245245
TEST_CFLAGS: ""
246246

247-
build_windows:
247+
.build_windows_template: &build_windows_template
248248
stage: build_openocd
249249
image: $CI_DOCKER_REGISTRY/esp32-toolchain-win-cross
250250
tags:
@@ -254,10 +254,9 @@ build_windows:
254254
- ${DIST_ART_DIR}
255255
expire_in: 2 weeks
256256
variables:
257-
CONF_HOST: "i686-w64-mingw32"
258-
PLATFORM_NAME: "win32"
259257
ARCHIVE_TOOL: "zip -r"
260258
ARCHIVE_EXT: "zip"
259+
CONF_HOST: "i686-w64-mingw32"
261260
INSTALL_TARGET: "install-strip"
262261
HOST_CC: ${CONF_HOST}-gcc
263262
needs:
@@ -278,6 +277,16 @@ build_windows:
278277
- *copy_stub_bins
279278
- *dist_archive
280279

280+
build_windows_win32:
281+
extends: .build_windows_template
282+
variables:
283+
PLATFORM_NAME: "win32"
284+
285+
build_windows_win64:
286+
extends: .build_windows_template
287+
variables:
288+
PLATFORM_NAME: "win64"
289+
281290
build_macos:
282291
<<: *build_macos_template
283292
variables:

.gitlab/ci/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ test_on_windows:
597597
tags:
598598
- test_jtag_win
599599
needs:
600-
- job: build_windows
600+
- job: build_windows_win32
601601
variables:
602602
# actually we don't need the project sources, but we need the `git clean` gitlab-runner's stage.
603603
# It's possible only for `fetch` or `clone`.

0 commit comments

Comments
 (0)