Commit 2be380d2 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'prepare-gitlab-assets-compile' into 'master'

Move gitlab:assets-compile to prepare

See merge request gitlab-org/gitlab!22202
parents c3448bf5 40c6bce8
...@@ -14,9 +14,7 @@ ...@@ -14,9 +14,7 @@
- .assets-compile-cache - .assets-compile-cache
- .only:changes-code-backstage-qa - .only:changes-code-backstage-qa
image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker-19.03.1 image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker-19.03.1
stage: test stage: prepare
dependencies: ["setup-test-env"]
needs: ["setup-test-env"]
services: services:
- docker:19.03.0-dind - docker:19.03.0-dind
variables: variables:
......
...@@ -218,6 +218,8 @@ graph RL; ...@@ -218,6 +218,8 @@ graph RL;
subgraph "`prepare` stage" subgraph "`prepare` stage"
A A
B
C
F F
K K
J J
...@@ -225,8 +227,6 @@ subgraph "`prepare` stage" ...@@ -225,8 +227,6 @@ subgraph "`prepare` stage"
end end
subgraph "`test` stage" subgraph "`test` stage"
B --> |needs| A;
C --> |needs| A;
D --> |needs| A; D --> |needs| A;
H -.-> |needs and depends on| A; H -.-> |needs and depends on| A;
H -.-> |needs and depends on| K; H -.-> |needs and depends on| K;
......
Markdown is supported
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