fix: set NIGHTLY=1 for correctly named nightly artifacts (#9987)
This commit is contained in:
parent
8265969f52
commit
69c1b85c26
|
|
@ -123,6 +123,9 @@ commands:
|
|||
type:
|
||||
type: string
|
||||
default: ""
|
||||
nightly:
|
||||
type: boolean
|
||||
default: false
|
||||
steps:
|
||||
- checkout
|
||||
- check-changed-files-or-halt
|
||||
|
|
@ -132,9 +135,14 @@ commands:
|
|||
condition: << parameters.release >>
|
||||
steps:
|
||||
- run: 'make package'
|
||||
- when:
|
||||
condition: << parameters.nightly >>
|
||||
steps:
|
||||
- run: 'NIGHTLY=1 make package include_packages="$(make << parameters.type >>)"'
|
||||
- unless:
|
||||
condition:
|
||||
or:
|
||||
- << parameters.nightly >>
|
||||
- << parameters.release >>
|
||||
steps:
|
||||
- run: 'make package include_packages="$(make << parameters.type >>)"'
|
||||
|
|
@ -193,65 +201,125 @@ jobs:
|
|||
parallelism: 4
|
||||
|
||||
windows-package:
|
||||
parameters:
|
||||
nightly:
|
||||
type: boolean
|
||||
default: false
|
||||
executor: go-1_17
|
||||
steps:
|
||||
- package-build:
|
||||
type: windows
|
||||
nightly: << parameters.nightly >>
|
||||
darwin-package:
|
||||
parameters:
|
||||
nightly:
|
||||
type: boolean
|
||||
default: false
|
||||
executor: go-1_17
|
||||
steps:
|
||||
- package-build:
|
||||
type: darwin
|
||||
nightly: << parameters.nightly >>
|
||||
i386-package:
|
||||
parameters:
|
||||
nightly:
|
||||
type: boolean
|
||||
default: false
|
||||
executor: go-1_17
|
||||
steps:
|
||||
- package-build:
|
||||
type: i386
|
||||
nightly: << parameters.nightly >>
|
||||
ppc64le-package:
|
||||
parameters:
|
||||
nightly:
|
||||
type: boolean
|
||||
default: false
|
||||
executor: go-1_17
|
||||
steps:
|
||||
- package-build:
|
||||
type: ppc64le
|
||||
nightly: << parameters.nightly >>
|
||||
s390x-package:
|
||||
parameters:
|
||||
nightly:
|
||||
type: boolean
|
||||
default: false
|
||||
executor: go-1_17
|
||||
steps:
|
||||
- package-build:
|
||||
type: s390x
|
||||
nightly: << parameters.nightly >>
|
||||
armel-package:
|
||||
parameters:
|
||||
nightly:
|
||||
type: boolean
|
||||
default: false
|
||||
executor: go-1_17
|
||||
steps:
|
||||
- package-build:
|
||||
type: armel
|
||||
nightly: << parameters.nightly >>
|
||||
amd64-package:
|
||||
parameters:
|
||||
nightly:
|
||||
type: boolean
|
||||
default: false
|
||||
executor: go-1_17
|
||||
steps:
|
||||
- package-build:
|
||||
type: amd64
|
||||
nightly: << parameters.nightly >>
|
||||
arm64-package:
|
||||
parameters:
|
||||
nightly:
|
||||
type: boolean
|
||||
default: false
|
||||
executor: go-1_17
|
||||
steps:
|
||||
- package-build:
|
||||
type: arm64
|
||||
nightly: << parameters.nightly >>
|
||||
mipsel-package:
|
||||
parameters:
|
||||
nightly:
|
||||
type: boolean
|
||||
default: false
|
||||
executor: go-1_17
|
||||
steps:
|
||||
- package-build:
|
||||
type: mipsel
|
||||
nightly: << parameters.nightly >>
|
||||
mips-package:
|
||||
parameters:
|
||||
nightly:
|
||||
type: boolean
|
||||
default: false
|
||||
executor: go-1_17
|
||||
steps:
|
||||
- package-build:
|
||||
type: mips
|
||||
nightly: << parameters.nightly >>
|
||||
static-package:
|
||||
parameters:
|
||||
nightly:
|
||||
type: boolean
|
||||
default: false
|
||||
executor: go-1_17
|
||||
steps:
|
||||
- package-build:
|
||||
type: static
|
||||
nightly: << parameters.nightly >>
|
||||
armhf-package:
|
||||
parameters:
|
||||
nightly:
|
||||
type: boolean
|
||||
default: false
|
||||
executor: go-1_17
|
||||
steps:
|
||||
- package-build:
|
||||
type: armhf
|
||||
nightly: << parameters.nightly >>
|
||||
|
||||
release:
|
||||
executor: go-1_17
|
||||
|
|
@ -361,54 +429,6 @@ commonjobs:
|
|||
requires:
|
||||
- 'test-go-1_17'
|
||||
- 'test-go-1_17-386'
|
||||
- &windows-package
|
||||
'windows-package':
|
||||
requires:
|
||||
- 'test-go-windows'
|
||||
- &darwin-package
|
||||
'darwin-package':
|
||||
requires:
|
||||
- 'test-go-mac'
|
||||
- &i386-package
|
||||
'i386-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- &ppc64le-package
|
||||
'ppc64le-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- &s390x-package
|
||||
's390x-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- &armel-package
|
||||
'armel-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- &amd64-package
|
||||
'amd64-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- &arm64-package
|
||||
'arm64-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- &armhf-package
|
||||
'armhf-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- &static-package
|
||||
'static-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- &mipsel-package
|
||||
'mipsel-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- &mips-package
|
||||
'mips-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
|
||||
workflows:
|
||||
version: 2
|
||||
|
|
@ -439,18 +459,42 @@ workflows:
|
|||
tags:
|
||||
only: /.*/
|
||||
- *test-awaiter
|
||||
- *windows-package
|
||||
- *darwin-package
|
||||
- *i386-package
|
||||
- *ppc64le-package
|
||||
- *s390x-package
|
||||
- *armel-package
|
||||
- *amd64-package
|
||||
- *arm64-package
|
||||
- *armhf-package
|
||||
- *static-package
|
||||
- *mipsel-package
|
||||
- *mips-package
|
||||
- 'windows-package':
|
||||
requires:
|
||||
- 'test-go-windows'
|
||||
- 'darwin-package':
|
||||
requires:
|
||||
- 'test-go-mac'
|
||||
- 'i386-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'ppc64le-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 's390x-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'armel-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'amd64-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'arm64-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'armhf-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'static-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'mipsel-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'mips-package':
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'generate-config':
|
||||
requires:
|
||||
- 'amd64-package'
|
||||
|
|
@ -527,32 +571,79 @@ workflows:
|
|||
- 'test-go-mac'
|
||||
- 'test-go-windows'
|
||||
- *test-awaiter
|
||||
- *windows-package
|
||||
- *darwin-package
|
||||
- *i386-package
|
||||
- *ppc64le-package
|
||||
- *s390x-package
|
||||
- *armel-package
|
||||
- *amd64-package
|
||||
- *arm64-package
|
||||
- *armhf-package
|
||||
- *static-package
|
||||
- *mipsel-package
|
||||
- *mips-package
|
||||
- 'windows-package':
|
||||
name: 'windows-package-nightly'
|
||||
nightly: true
|
||||
requires:
|
||||
- 'test-go-windows'
|
||||
- 'darwin-package':
|
||||
name: 'darwin-package-nightly'
|
||||
nightly: true
|
||||
requires:
|
||||
- 'test-go-mac'
|
||||
- 'i386-package':
|
||||
name: 'i386-package-nightly'
|
||||
nightly: true
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'ppc64le-package':
|
||||
name: 'ppc64le-package-nightly'
|
||||
nightly: true
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 's390x-package':
|
||||
name: 's390x-package-nightly'
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'armel-package':
|
||||
name: 'armel-package-nightly'
|
||||
nightly: true
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'amd64-package':
|
||||
name: 'amd64-package-nightly'
|
||||
nightly: true
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'arm64-package':
|
||||
name: 'arm64-package-nightly'
|
||||
nightly: true
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'armhf-package':
|
||||
name: 'armhf-package-nightly'
|
||||
nightly: true
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'static-package':
|
||||
name: 'static-package-nightly'
|
||||
nightly: true
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'mipsel-package':
|
||||
name: 'mipsel-package-nightly'
|
||||
nightly: true
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- 'mips-package':
|
||||
name: 'mips-package-nightly'
|
||||
nightly: true
|
||||
requires:
|
||||
- 'test-awaiter'
|
||||
- nightly:
|
||||
requires:
|
||||
- 'i386-package'
|
||||
- 'ppc64le-package'
|
||||
- 's390x-package'
|
||||
- 'armel-package'
|
||||
- 'amd64-package'
|
||||
- 'mipsel-package'
|
||||
- 'mips-package'
|
||||
- 'darwin-package'
|
||||
- 'windows-package'
|
||||
- 'static-package'
|
||||
- 'arm64-package'
|
||||
- 'armhf-package'
|
||||
- 'i386-package-nightly'
|
||||
- 'ppc64le-package-nightly'
|
||||
- 's390x-package-nightly'
|
||||
- 'armel-package-nightly'
|
||||
- 'amd64-package-nightly'
|
||||
- 'mipsel-package-nightly'
|
||||
- 'mips-package-nightly'
|
||||
- 'darwin-package-nightly'
|
||||
- 'windows-package-nightly'
|
||||
- 'static-package-nightly'
|
||||
- 'arm64-package-nightly'
|
||||
- 'armhf-package-nightly'
|
||||
triggers:
|
||||
- schedule:
|
||||
cron: "0 7 * * *"
|
||||
|
|
|
|||
Loading…
Reference in New Issue