Skip to content

Commit 5cb3854

Browse files
shaun-nxshaun-nx
committed
Add build_os to conformance and functional test matrix. Update tags for both workflows
1 parent c2c0f47 commit 5cb3854

File tree

3 files changed

+34
-22
lines changed

3 files changed

+34
-22
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ jobs:
279279
fail-fast: false
280280
matrix:
281281
image: [nginx, plus]
282+
build_os: ["", ubi]
282283
k8s-version:
283284
[
284285
"${{ needs.vars.outputs.min_k8s_version }}",
@@ -299,6 +300,7 @@ jobs:
299300
fail-fast: false
300301
matrix:
301302
image: [nginx, plus]
303+
build_os: ["", ubi]
302304
k8s-version:
303305
[
304306
"${{ needs.vars.outputs.min_k8s_version }}",

‎.github/workflows/conformance.yml‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
image:
77
required: true
88
type: string
9+
build_os:
10+
required: false
11+
type: string
12+
default: ''
913
k8s-version:
1014
required: true
1115
type: string
@@ -75,12 +79,12 @@ jobs:
7579
images: |
7680
name=ghcr.io/nginx/nginx-gateway-fabric
7781
tags: |
78-
type=semver,pattern={{version}}
79-
type=edge
80-
type=schedule
81-
type=ref,event=pr
82-
type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') && !inputs.production-release }}
83-
type=raw,value={{inputs.release_version}},enable=${{ inputs.production-release && inputs.release_version != '' }}
82+
type=semver,pattern={{version}},suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
83+
type=edge,suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
84+
type=schedule,suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
85+
type=ref,event=pr,suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
86+
type=ref,event=branch,suffix=-rc${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }},enable=${{ startsWith(github.ref, 'refs/heads/release') && inputs.tag == '' }}
87+
type=raw,value=${{ inputs.tag }},enable=${{ inputs.tag != '' }},suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
8488
8589
- name: NGINX Docker meta
8690
id: nginx-meta
@@ -89,12 +93,12 @@ jobs:
8993
images: |
9094
name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
9195
tags: |
92-
type=semver,pattern={{version}}
93-
type=edge
94-
type=schedule
95-
type=ref,event=pr
96-
type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') && !inputs.production-release }}
97-
type=raw,value={{inputs.release_version}},enable=${{ inputs.production-release && inputs.release_version != '' }}
96+
type=semver,pattern={{version}},suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
97+
type=edge,suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
98+
type=schedule,suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
99+
type=ref,event=pr,suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
100+
type=ref,event=branch,suffix=-rc${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }},enable=${{ startsWith(github.ref, 'refs/heads/release') && inputs.tag == '' }}
101+
type=raw,value=${{ inputs.tag }},enable=${{ inputs.tag != '' }},suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
98102
99103
- name: Build binary
100104
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0

‎.github/workflows/functional.yml‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
image:
77
required: true
88
type: string
9+
build_os:
10+
required: false
11+
type: string
12+
default: ''
913
k8s-version:
1014
required: true
1115
type: string
@@ -61,11 +65,12 @@ jobs:
6165
images: |
6266
name=ghcr.io/nginx/nginx-gateway-fabric
6367
tags: |
64-
type=semver,pattern={{version}}
65-
type=schedule
66-
type=edge
67-
type=ref,event=pr
68-
type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') }}
68+
type=semver,pattern={{version}},suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
69+
type=edge,suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
70+
type=schedule,suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
71+
type=ref,event=pr,suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
72+
type=ref,event=branch,suffix=-rc${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }},enable=${{ startsWith(github.ref, 'refs/heads/release') && inputs.tag == '' }}
73+
type=raw,value=${{ inputs.tag }},enable=${{ inputs.tag != '' }},suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
6974
7075
- name: NGINX Docker meta
7176
id: nginx-meta
@@ -74,11 +79,12 @@ jobs:
7479
images: |
7580
name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
7681
tags: |
77-
type=semver,pattern={{version}}
78-
type=edge
79-
type=schedule
80-
type=ref,event=pr
81-
type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') }}
82+
type=semver,pattern={{version}},suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
83+
type=edge,suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
84+
type=schedule,suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
85+
type=ref,event=pr,suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
86+
type=ref,event=branch,suffix=-rc${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }},enable=${{ startsWith(github.ref, 'refs/heads/release') && inputs.tag == '' }}
87+
type=raw,value=${{ inputs.tag }},enable=${{ inputs.tag != '' }},suffix=${{ inputs.build_os != '' && format('-{0}', inputs.build_os) || '' }}
8288
8389
- name: Build binary
8490
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0

0 commit comments

Comments
 (0)