Skip to content

Commit fa5e43c

Browse files
committed
CI: Use shared buildkite pipeline vars file
1 parent f75d514 commit fa5e43c

File tree

3 files changed

+17
-23
lines changed

3 files changed

+17
-23
lines changed

.buildkite/pipeline.yml

+10-16
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
22
---
33

4-
# Nodes with values to reuse in the pipeline.
5-
common_params:
6-
# Common plugin settings to use with the `plugins` key.
7-
- &common_plugins
8-
- automattic/a8c-ci-toolkit#3.4.2
9-
104
# Run everything on the `android` queue
115
agents:
126
queue: android
@@ -15,68 +9,68 @@ steps:
159
- label: "Gradle Wrapper Validation"
1610
command: |
1711
validate_gradle_wrapper
18-
plugins: *common_plugins
12+
plugins: [$CI_TOOLKIT]
1913

2014
# Wait for Gradle Wrapper to be validated before running any other jobs
2115
- wait
2216

2317
- label: "Lint"
2418
key: "lint"
2519
command: .buildkite/commands/lint.sh
26-
plugins: *common_plugins
20+
plugins: [$CI_TOOLKIT]
2721
artifact_paths:
2822
- "aztec/build/reports/*"
2923

3024
- label: "Unit Tests"
3125
key: "test"
3226
command: .buildkite/commands/unit-test.sh
33-
plugins: *common_plugins
27+
plugins: [$CI_TOOLKIT]
3428
artifact_paths:
3529
- "aztec/build/test-results/**/*.xml"
3630

3731
- label: "Connected Tests"
3832
key: "connected-test"
3933
command: .buildkite/commands/connected-tests.sh
40-
plugins: *common_plugins
34+
plugins: [$CI_TOOLKIT]
4135
artifact_paths:
4236
- "aztec/build/test-results/**/*.xml"
4337

4438
- label: "Publish :aztec"
4539
key: "publish-aztec"
4640
command: .buildkite/commands/publish-aztec.sh
47-
plugins: *common_plugins
41+
plugins: [$CI_TOOLKIT]
4842

4943
- label: "Publish :glide-loader"
5044
key: "publish-glide-loader"
5145
depends_on:
5246
- "publish-aztec"
5347
command: .buildkite/commands/publish-glide-loader.sh
54-
plugins: *common_plugins
48+
plugins: [$CI_TOOLKIT]
5549

5650
- label: "Publish :picasso-loader"
5751
key: "publish-picasso-loader"
5852
depends_on:
5953
- "publish-aztec"
6054
command: .buildkite/commands/publish-picasso-loader.sh
61-
plugins: *common_plugins
55+
plugins: [$CI_TOOLKIT]
6256

6357
- label: "Publish :wordpress-shortcodes"
6458
key: "publish-wordpress-shortcodes"
6559
depends_on:
6660
- "publish-aztec"
6761
command: .buildkite/commands/publish-wordpress-shortcodes.sh
68-
plugins: *common_plugins
62+
plugins: [$CI_TOOLKIT]
6963

7064
- label: "Publish :wordpress-comments"
7165
key: "publish-wordpress-comments"
7266
depends_on:
7367
- "publish-aztec"
7468
command: .buildkite/commands/publish-wordpress-comments.sh
75-
plugins: *common_plugins
69+
plugins: [$CI_TOOLKIT]
7670

7771
- label: "Publish :media-placeholders"
7872
key: "publish-media-placeholders"
7973
depends_on:
8074
- "publish-aztec"
8175
command: .buildkite/commands/publish-media-placeholders.sh
82-
plugins: *common_plugins
76+
plugins: [$CI_TOOLKIT]

.buildkite/schedules/dependency-analysis.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
22
---
33

4-
# Nodes with values to reuse in the pipeline.
5-
common_params:
6-
# Common plugin settings to use with the `plugins` key.
7-
- &common_plugins
8-
- automattic/a8c-ci-toolkit#3.4.2
9-
104
# Run everything on the `android` queue
115
agents:
126
queue: android
@@ -16,7 +10,7 @@ steps:
1610
command: |
1711
echo "--- 📊 Analyzing"
1812
./gradlew buildHealth
19-
plugins: *common_plugins
13+
plugins: [$CI_TOOLKIT]
2014
artifact_paths:
2115
- "build/reports/dependency-analysis/build-health-report.*"
2216
notify:

.buildkite/shared-pipeline-vars

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
3+
# This file is `source`'d before calling `buildkite-agent pipeline upload`, and can be used
4+
# to set up some variables that will be interpolated in the `.yml` pipeline before uploading it.
5+
6+
export CI_TOOLKIT="automattic/a8c-ci-toolkit#3.4.2"

0 commit comments

Comments
 (0)