Skip to content

Commit 97bf760

Browse files
committed
Add prefix v into docker image tag name
Signed-off-by: rick <[email protected]>
1 parent 9c1a7c7 commit 97bf760

File tree

1 file changed

+28
-42
lines changed

1 file changed

+28
-42
lines changed

.github/workflows/pull-request.yaml

Lines changed: 28 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,15 @@ name: Pull Request
33
on:
44
push:
55
branches:
6-
- '**'
6+
- master
7+
- test-* # make it be easier for contributors to test
78
tags:
89
- 'v*.*.*'
910
pull_request:
1011
branches:
1112
- 'master'
1213

1314
jobs:
14-
Test:
15-
runs-on: ubuntu-20.04
16-
steps:
17-
- uses: actions/checkout@v2
18-
- name: Install Dep
19-
run: |
20-
curl -L https://github.com/LinuxSuRen/http-downloader/releases/download/v0.0.29/hd-linux-amd64.tar.gz | tar xzv
21-
sudo rm -rf $(which hd)
22-
sudo mv hd /usr/local/bin
23-
sudo hd install openshift/source-to-image v1.3.1
24-
sudo apt-get install libkrb5-dev -y
25-
26-
sudo npm -g --unsafe-perm=true --allow-root install fish-pepper --build-from-source
27-
- name: Test
28-
run: |
29-
./test.sh
30-
3115
BuildCentOSJava11:
3216
runs-on: ubuntu-20.04
3317
steps:
@@ -44,9 +28,9 @@ jobs:
4428
type=schedule
4529
type=ref,event=branch
4630
type=ref,event=pr
47-
type=semver,pattern={{version}}
48-
type=semver,pattern={{major}}.{{minor}}
49-
type=semver,pattern={{major}}
31+
type=semver,pattern=v{{version}}
32+
type=semver,pattern=v{{major}}.{{minor}}
33+
type=semver,pattern=v{{major}}
5034
type=sha
5135
- name: Docker meta for Contributors
5236
id: metaContributors
@@ -59,9 +43,9 @@ jobs:
5943
type=schedule
6044
type=ref,event=branch
6145
type=ref,event=pr
62-
type=semver,pattern={{version}}
63-
type=semver,pattern={{major}}.{{minor}}
64-
type=semver,pattern={{major}}
46+
type=semver,pattern=v{{version}}
47+
type=semver,pattern=v{{major}}.{{minor}}
48+
type=semver,pattern=v{{major}}
6549
type=sha
6650
- name: Set up QEMU
6751
uses: docker/setup-qemu-action@v1
@@ -115,9 +99,9 @@ jobs:
11599
type=schedule
116100
type=ref,event=branch
117101
type=ref,event=pr
118-
type=semver,pattern={{version}}
119-
type=semver,pattern={{major}}.{{minor}}
120-
type=semver,pattern={{major}}
102+
type=semver,pattern=v{{version}}
103+
type=semver,pattern=v{{major}}.{{minor}}
104+
type=semver,pattern=v{{major}}
121105
type=sha
122106
- name: Docker meta for Contributors
123107
id: metaContributors
@@ -130,9 +114,9 @@ jobs:
130114
type=schedule
131115
type=ref,event=branch
132116
type=ref,event=pr
133-
type=semver,pattern={{version}}
134-
type=semver,pattern={{major}}.{{minor}}
135-
type=semver,pattern={{major}}
117+
type=semver,pattern=v{{version}}
118+
type=semver,pattern=v{{major}}.{{minor}}
119+
type=semver,pattern=v{{major}}
136120
type=sha
137121
- name: Set up QEMU
138122
uses: docker/setup-qemu-action@v1
@@ -172,6 +156,7 @@ jobs:
172156

173157
BuildTomcatJava8:
174158
runs-on: ubuntu-20.04
159+
needs: BuildCentOSJava8
175160
steps:
176161
- uses: actions/checkout@v2
177162
- name: Docker meta for KubeSphere
@@ -186,9 +171,9 @@ jobs:
186171
type=schedule
187172
type=ref,event=branch
188173
type=ref,event=pr
189-
type=semver,pattern={{version}}
190-
type=semver,pattern={{major}}.{{minor}}
191-
type=semver,pattern={{major}}
174+
type=semver,pattern=v{{version}}
175+
type=semver,pattern=v{{major}}.{{minor}}
176+
type=semver,pattern=v{{major}}
192177
type=sha
193178
- name: Docker meta for Contributors
194179
id: metaContributors
@@ -201,9 +186,9 @@ jobs:
201186
type=schedule
202187
type=ref,event=branch
203188
type=ref,event=pr
204-
type=semver,pattern={{version}}
205-
type=semver,pattern={{major}}.{{minor}}
206-
type=semver,pattern={{major}}
189+
type=semver,pattern=v{{version}}
190+
type=semver,pattern=v{{major}}.{{minor}}
191+
type=semver,pattern=v{{major}}
207192
type=sha
208193
- name: Set up QEMU
209194
uses: docker/setup-qemu-action@v1
@@ -243,6 +228,7 @@ jobs:
243228

244229
BuildTomcatJava11:
245230
runs-on: ubuntu-20.04
231+
needs: BuildCentOSJava11
246232
steps:
247233
- uses: actions/checkout@v2
248234
- name: Docker meta for KubeSphere
@@ -257,9 +243,9 @@ jobs:
257243
type=schedule
258244
type=ref,event=branch
259245
type=ref,event=pr
260-
type=semver,pattern={{version}}
261-
type=semver,pattern={{major}}.{{minor}}
262-
type=semver,pattern={{major}}
246+
type=semver,pattern=v{{version}}
247+
type=semver,pattern=v{{major}}.{{minor}}
248+
type=semver,pattern=v{{major}}
263249
type=sha
264250
- name: Docker meta for Contributors
265251
id: metaContributors
@@ -272,9 +258,9 @@ jobs:
272258
type=schedule
273259
type=ref,event=branch
274260
type=ref,event=pr
275-
type=semver,pattern={{version}}
276-
type=semver,pattern={{major}}.{{minor}}
277-
type=semver,pattern={{major}}
261+
type=semver,pattern=v{{version}}
262+
type=semver,pattern=v{{major}}.{{minor}}
263+
type=semver,pattern=v{{major}}
278264
type=sha
279265
- name: Set up QEMU
280266
uses: docker/setup-qemu-action@v1

0 commit comments

Comments
 (0)