Skip to content

Commit 880a6f1

Browse files
committed
Change Workflow dependency
1 parent b224ecf commit 880a6f1

2 files changed

Lines changed: 25 additions & 47 deletions

File tree

.github/workflows/action_branch.yml

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ jobs:
4444
# -----------------------------------------------------------------------------------------------
4545
base:
4646
needs:
47-
- params
4847
- configure
4948
uses: ./.github/workflows/zzz-reuse-build.yml
5049
with:
@@ -60,7 +59,6 @@ jobs:
6059

6160
base-test:
6261
needs:
63-
- params
6462
- configure
6563
- base
6664
uses: ./.github/workflows/zzz-reuse-test.yml
@@ -81,10 +79,8 @@ jobs:
8179
# -----------------------------------------------------------------------------------------------
8280
mods:
8381
needs:
84-
- params
8582
- configure
8683
- base
87-
- base-test
8884
uses: ./.github/workflows/zzz-reuse-build.yml
8985
with:
9086
enabled: true
@@ -99,10 +95,7 @@ jobs:
9995

10096
mods-test:
10197
needs:
102-
- params
10398
- configure
104-
- base
105-
- base-test
10699
- mods
107100
uses: ./.github/workflows/zzz-reuse-test.yml
108101
with:
@@ -122,12 +115,8 @@ jobs:
122115
# -----------------------------------------------------------------------------------------------
123116
prod:
124117
needs:
125-
- params
126118
- configure
127-
- base
128-
- base-test
129119
- mods
130-
- mods-test
131120
uses: ./.github/workflows/zzz-reuse-build.yml
132121
with:
133122
enabled: true
@@ -142,12 +131,7 @@ jobs:
142131

143132
prod-test:
144133
needs:
145-
- params
146134
- configure
147-
- base
148-
- base-test
149-
- mods
150-
- mods-test
151135
- prod
152136
uses: ./.github/workflows/zzz-reuse-test.yml
153137
with:
@@ -167,14 +151,8 @@ jobs:
167151
# -----------------------------------------------------------------------------------------------
168152
work:
169153
needs:
170-
- params
171154
- configure
172-
- base
173-
- base-test
174-
- mods
175-
- mods-test
176155
- prod
177-
- prod-test
178156
uses: ./.github/workflows/zzz-reuse-build.yml
179157
with:
180158
enabled: true
@@ -189,14 +167,7 @@ jobs:
189167

190168
work-test:
191169
needs:
192-
- params
193170
- configure
194-
- base
195-
- base-test
196-
- mods
197-
- mods-test
198-
- prod
199-
- prod-test
200171
- work
201172
uses: ./.github/workflows/zzz-reuse-test.yml
202173
with:
@@ -216,15 +187,10 @@ jobs:
216187
# -----------------------------------------------------------------------------------------------
217188
push-image:
218189
needs:
219-
- params
220190
- configure
221-
- base
222191
- base-test
223-
- mods
224192
- mods-test
225-
- prod
226193
- prod-test
227-
- work
228194
- work-test
229195
uses: ./.github/workflows/zzz-reuse-deploy-images.yml
230196
with:
@@ -245,14 +211,6 @@ jobs:
245211
needs:
246212
- params
247213
- configure
248-
- base
249-
- base-test
250-
- mods
251-
- mods-test
252-
- prod
253-
- prod-test
254-
- work
255-
- work-test
256214
- push-image
257215
uses: ./.github/workflows/zzz-reuse-deploy-manifests.yml
258216
with:

.github/workflows/zzz-reuse-test.yml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ jobs:
110110
name: ${{ steps.set-artifact-name.outputs.base }}
111111
attempt_limit: 20
112112
attempt_delay: 10000
113-
if: ${{ inputs.flavour == 'mods' }}
113+
if: ${{ inputs.flavour == 'base' }}
114114

115115
- name: "[Artifact Load] Import base"
116116
uses: cytopia/[email protected]
117117
with:
118118
command: |
119119
make load INFILE=${{ steps.set-artifact-name.outputs.base }}
120-
if: ${{ inputs.flavour == 'mods' }}
120+
if: ${{ inputs.flavour == 'base' }}
121121

122122
###
123123
### Download and import mods
@@ -130,14 +130,14 @@ jobs:
130130
name: ${{ steps.set-artifact-name.outputs.mods }}
131131
attempt_limit: 20
132132
attempt_delay: 10000
133-
if: ${{ inputs.flavour == 'prod' }}
133+
if: ${{ inputs.flavour == 'mods' }}
134134

135135
- name: "[Artifact Load] Import mods"
136136
uses: cytopia/[email protected]
137137
with:
138138
command: |
139139
make load INFILE=${{ steps.set-artifact-name.outputs.mods }}
140-
if: ${{ inputs.flavour == 'prod' }}
140+
if: ${{ inputs.flavour == 'mods' }}
141141

142142
###
143143
### Download and import prod
@@ -150,13 +150,33 @@ jobs:
150150
name: ${{ steps.set-artifact-name.outputs.prod }}
151151
attempt_limit: 20
152152
attempt_delay: 10000
153-
if: ${{ inputs.flavour == 'work' }}
153+
if: ${{ inputs.flavour == 'prod' }}
154154

155155
- name: "[Artifact Load] Import prod"
156156
uses: cytopia/[email protected]
157157
with:
158158
command: |
159159
make load INFILE=${{ steps.set-artifact-name.outputs.prod }}
160+
if: ${{ inputs.flavour == 'prod' }}
161+
162+
###
163+
### Download and import work
164+
###
165+
- name: "[Artifact Load] Download work"
166+
uses: Wandalen/[email protected]
167+
with:
168+
action: actions/download-artifact@v3
169+
with: |
170+
name: ${{ steps.set-artifact-name.outputs.work }}
171+
attempt_limit: 20
172+
attempt_delay: 10000
173+
if: ${{ inputs.flavour == 'work' }}
174+
175+
- name: "[Artifact Load] Import work"
176+
uses: cytopia/[email protected]
177+
with:
178+
command: |
179+
make load INFILE=${{ steps.set-artifact-name.outputs.work }}
160180
if: ${{ inputs.flavour == 'work' }}
161181

162182

0 commit comments

Comments
 (0)