Commit 2e0a6caf authored by IOhannes m zmölnig's avatar IOhannes m zmölnig
Browse files

use double-extends rather than YAML-anchors for release/snapshot

parent b40f248f
...@@ -50,23 +50,20 @@ variables: ...@@ -50,23 +50,20 @@ variables:
- *script_make - *script_make
- *script_make_check - *script_make_check
- *script_make_install - *script_make_install
artifacts:
.build:snapshot: &snapshot
except:
- tags
artifacts: &snapshot_artifacts
name: ${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME}_${CI_JOB_NAME%_*} name: ${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME}_${CI_JOB_NAME%_*}
paths: paths:
- "${IEM_CI_PKGLIBDIR:-${CI_PROJECT_NAME}}" - "${IEM_CI_PKGLIBDIR:-${CI_PROJECT_NAME}}"
.snapshot:
except:
- tags
artifacts:
expire_in: 1 week expire_in: 1 week
.build:release: &release .release:
only: only:
- tags - tags
artifacts: &release_artifacts
name: ${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME}_${CI_JOB_NAME%_*}
paths:
- "${IEM_CI_PKGLIBDIR:-${CI_PROJECT_NAME}}"
.build:linux: &build_linux .build:linux: &build_linux
extends: .build:script extends: .build:script
...@@ -155,54 +152,22 @@ variables: ...@@ -155,54 +152,22 @@ variables:
### release jobs ### release jobs
.Linux: .Linux:
<<: *build_linux <<: *build_linux
<<: *release
.Linuxi386: .Linuxi386:
allow_failure: true allow_failure: true
<<: *build_linux_i386 <<: *build_linux_i386
<<: *release
.LinuxARMhf: .LinuxARMhf:
allow_failure: true allow_failure: true
<<: *build_linux_armhf <<: *build_linux_armhf
<<: *release
.LinuxARM64: .LinuxARM64:
allow_failure: true allow_failure: true
<<: *build_linux_arm64 <<: *build_linux_arm64
<<: *release
.Darwin: .Darwin:
<<: *build_macos <<: *build_macos
<<: *release
.w32: .w32:
<<: *build_w32 <<: *build_w32
<<: *release
.w64: .w64:
<<: *build_w64 <<: *build_w64
<<: *release
### snapshot jobs
.Linux_snapshot:
<<: *build_linux
<<: *snapshot
.Linuxi386_snapshot:
allow_failure: true
<<: *build_linux_i386
<<: *snapshot
.LinuxARMhf_snapshot:
allow_failure: true
<<: *build_linux_armhf
<<: *snapshot
.LinuxARM64_snapshot:
allow_failure: true
<<: *build_linux_arm64
<<: *snapshot
.Darwin_snapshot:
<<: *build_macos
<<: *snapshot
.w32_snapshot:
<<: *build_w32
<<: *snapshot
.w64_snapshot:
<<: *build_w64
<<: *snapshot
####################################################################### #######################################################################
### create deken packages and (optionally) upload them; ### create deken packages and (optionally) upload them;
......
...@@ -21,41 +21,65 @@ ...@@ -21,41 +21,65 @@
### release jobs ### release jobs
Linux: Linux:
extends: .Linux extends:
- .Linux
- .release
Linuxi386: Linuxi386:
extends: .Linuxi386 extends:
allow_failure: true - .Linuxi386
- .release
LinuxARMhf: LinuxARMhf:
extends: .LinuxARMhf extends:
allow_failure: true - .LinuxARMhf
- .release
LinuxARM64: LinuxARM64:
extends: .LinuxARM64 extends:
allow_failure: true - .LinuxARM64
- .release
Darwin: Darwin:
extends: .Darwin extends:
- .Darwin
- .release
w32: w32:
extends: .w32 extends:
- .w32
- .release
w64: w64:
extends: .w64 extends:
- .w64
- .release
### snapshot jobs ### snapshot jobs
Linux_snapshot: Linux_snapshot:
extends: .Linux_snapshot extends:
- .Linux
- .snapshot
Linuxi386_snapshot: Linuxi386_snapshot:
extends: .Linuxi386_snapshot extends:
allow_failure: true - .Linuxi386
- .snapshot
LinuxARMhf_snapshot: LinuxARMhf_snapshot:
extends: .LinuxARMhf_snapshot extends:
allow_failure: true - .LinuxARMhf
- .snapshot
LinuxARM64_snapshot: LinuxARM64_snapshot:
extends: .LinuxARM64_snapshot extends:
allow_failure: true - .LinuxARM64
- .snapshot
Darwin_snapshot: Darwin_snapshot:
extends: .Darwin_snapshot extends:
- .Darwin
- .snapshot
w32_snapshot: w32_snapshot:
extends: .w32_snapshot extends:
- .w32
- .snapshot
w64_snapshot: w64_snapshot:
extends: .w64_snapshot extends:
- .w64
- .snapshot
####################################################################### #######################################################################
### create deken packages and (optionally) upload them; ### create deken packages and (optionally) upload them;
...@@ -63,13 +87,11 @@ w64_snapshot: ...@@ -63,13 +87,11 @@ w64_snapshot:
### set DEKEN_USERNAME/DEKEN_PASSWORD in the CI-project settings. ### set DEKEN_USERNAME/DEKEN_PASSWORD in the CI-project settings.
### (https://git.iem.at/help/ci/variables/README#variables) ### (https://git.iem.at/help/ci/variables/README#variables)
deken: deken:
extends: .deken extends:
only: - .deken
- tags - .release
deken_snapshot: deken_snapshot:
extends: .deken extends:
except: - .deken
- tags - .snapshot
artifacts:
expire_in: 1 week
Supports Markdown
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