Commit 300cb053 authored by Xavier Claessens's avatar Xavier Claessens
Browse files

ci: Also always keep artifacts for cross builds

This copy/paste the same artifacts part for all CI definitions to
unformize.
parent 1e906054
Pipeline #14386 passed with stages
in 18 minutes and 54 seconds
...@@ -42,6 +42,8 @@ fedora-meson-android_ndk_r16_api21_arm64: ...@@ -42,6 +42,8 @@ fedora-meson-android_ndk_r16_api21_arm64:
- meson --cross-file=/opt/cross-file-android_ndk_r16_api21_arm64.txt -Diconv=gnu -Dinternal_pcre=true --buildtype debug _build - meson --cross-file=/opt/cross-file-android_ndk_r16_api21_arm64.txt -Diconv=gnu -Dinternal_pcre=true --buildtype debug _build
- ninja -C _build - ninja -C _build
artifacts: artifacts:
name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
when: always
paths: paths:
- "${CI_PROJECT_DIR}/_build/meson-logs" - "${CI_PROJECT_DIR}/_build/meson-logs"
...@@ -54,6 +56,8 @@ fedora-meson-mingw64: ...@@ -54,6 +56,8 @@ fedora-meson-mingw64:
- meson --cross-file=/opt/cross_file_mingw64.txt --buildtype debug _build - meson --cross-file=/opt/cross_file_mingw64.txt --buildtype debug _build
- ninja -C _build - ninja -C _build
artifacts: artifacts:
name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
when: always
paths: paths:
- "${CI_PROJECT_DIR}/_build/meson-logs" - "${CI_PROJECT_DIR}/_build/meson-logs"
...@@ -68,11 +72,11 @@ msys2-mingw32: ...@@ -68,11 +72,11 @@ msys2-mingw32:
- C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20 - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20
- C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh" - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
artifacts: artifacts:
name: "glib-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%" name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
when: always when: always
paths: paths:
- _build/meson-logs - "${CI_PROJECT_DIR}/_build/meson-logs"
- _coverage/ - "${CI_PROJECT_DIR}/_coverage"
vs2017-x64: vs2017-x64:
stage: build stage: build
...@@ -81,10 +85,10 @@ vs2017-x64: ...@@ -81,10 +85,10 @@ vs2017-x64:
script: script:
- .gitlab-ci/test-msvc.bat - .gitlab-ci/test-msvc.bat
artifacts: artifacts:
name: "glib-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%" name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
when: always when: always
paths: paths:
- _build/meson-logs - "${CI_PROJECT_DIR}/_build/meson-logs"
coverage: coverage:
stage: coverage stage: coverage
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment