Skip to content

Commit e54e762

Browse files
committed
Merge branch 'trunk' into renovate/gradle.ext.measurebuildsversion
2 parents 35443aa + e30e47c commit e54e762

File tree

239 files changed

+8509
-5525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+8509
-5525
lines changed

.buildkite/beta-builds.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
---
3+
14
# This pipeline is meant to be run via the Buildkite API, and is
25
# only used for beta builds
36

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#2.17.0
7+
agents:
8+
queue: "android"
99

1010
steps:
1111
#################
@@ -14,7 +14,7 @@ steps:
1414
- label: "Gradle Wrapper Validation"
1515
command: |
1616
validate_gradle_wrapper
17-
plugins: *common_plugins
17+
plugins: [$CI_TOOLKIT]
1818

1919
# Wait for Gradle Wrapper to be validated before running any other jobs
2020
- wait
@@ -47,15 +47,15 @@ steps:
4747
key: wpbuild
4848
command: ".buildkite/commands/beta-build.sh wordpress"
4949
depends_on: wplint
50-
plugins: *common_plugins
50+
plugins: [$CI_TOOLKIT]
5151
notify:
5252
- slack: "#build-and-ship"
5353

5454
- label: ":jetpack: :android: Beta Build"
5555
key: jpbuild
5656
command: ".buildkite/commands/beta-build.sh jetpack"
5757
depends_on: jplint
58-
plugins: *common_plugins
58+
plugins: [$CI_TOOLKIT]
5959
notify:
6060
- slack: "#build-and-ship"
6161

@@ -67,4 +67,4 @@ steps:
6767
- wpbuild
6868
- jpbuild
6969
command: ".buildkite/commands/create-github-release.sh"
70-
plugins: *common_plugins
70+
plugins: [$CI_TOOLKIT]

.buildkite/code-freeze.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
# Nodes with values to reuse in the pipeline.
2-
common_params:
3-
# Common plugin settings to use with the `plugins` key.
4-
- &common_plugins
5-
- automattic/a8c-ci-toolkit#2.17.0
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
---
3+
64

75
steps:
86
- label: "Code Freeze"
9-
plugins: *common_plugins
7+
plugins: [$CI_TOOLKIT]
108
command: |
11-
.buildkite/commands/configure-git-for-release-management.sh
9+
echo '--- :robot_face: Use bot for git operations'
10+
source use-bot-for-git
1211
12+
echo '--- :ruby: Setup Ruby Tools'
1313
install_gems
1414
15+
echo '--- :snowflake: Start Code Freeze'
1516
bundle exec fastlane code_freeze skip_confirm:true
17+
agents:
18+
queue: "tumblr-metal"

.buildkite/commands/configure-git-for-release-management.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

.buildkite/complete-code-freeze.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
# Nodes with values to reuse in the pipeline.
2-
common_params:
3-
# Common plugin settings to use with the `plugins` key.
4-
- &common_plugins
5-
- automattic/a8c-ci-toolkit#2.17.0
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
---
3+
64

75
steps:
86
- label: "Complete Code Freeze"
9-
plugins: *common_plugins
7+
plugins: [$CI_TOOLKIT]
108
command: |
11-
.buildkite/commands/configure-git-for-release-management.sh
9+
echo '--- :robot_face: Use bot for git operations'
10+
source use-bot-for-git
11+
12+
echo '--- :git: Checkout Release Branch'
1213
.buildkite/commands/checkout-release-branch.sh
1314
15+
echo '--- :ruby: Setup Ruby Tools'
1416
install_gems
1517
18+
echo '--- :snowflake: Complete Code Freeze'
1619
bundle exec fastlane complete_code_freeze skip_confirm:true
20+
agents:
21+
queue: "tumblr-metal"

.buildkite/finalize-release.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1-
# Nodes with values to reuse in the pipeline.
2-
common_params:
3-
# Common plugin settings to use with the `plugins` key.
4-
- &common_plugins
5-
- automattic/a8c-ci-toolkit#2.17.0
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
---
3+
64

75
steps:
86
- label: "Finalize release"
9-
plugins: *common_plugins
7+
plugins: [$CI_TOOLKIT]
108
command: |
11-
.buildkite/commands/configure-git-for-release-management.sh
9+
echo '--- :robot_face: Use bot for git operations'
10+
source use-bot-for-git
11+
12+
echo '--- :git: Checkout Release Branch'
1213
.buildkite/commands/checkout-release-branch.sh
1314
15+
echo '--- :ruby: Setup Ruby Tools'
1416
install_gems
1517
1618
cp gradle.properties-example gradle.properties
1719
20+
echo '--- :shipit: Finalize Release'
1821
bundle exec fastlane finalize_release skip_confirm:true
22+
agents:
23+
queue: "tumblr-metal"

.buildkite/new-beta-release.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
# Nodes with values to reuse in the pipeline.
2-
common_params:
3-
# Common plugin settings to use with the `plugins` key.
4-
- &common_plugins
5-
- automattic/a8c-ci-toolkit#2.17.0
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
---
3+
64

75
steps:
86
- label: "New Beta Release"
9-
plugins: *common_plugins
7+
plugins: [$CI_TOOLKIT]
108
command: |
11-
.buildkite/commands/configure-git-for-release-management.sh
9+
echo '--- :robot_face: Use bot for git operations'
10+
source use-bot-for-git
1211
12+
echo '--- :ruby: Setup Ruby Tools'
1313
install_gems
1414
1515
cp gradle.properties-example gradle.properties
1616
17+
echo '--- :shipit: New Beta Release'
1718
bundle exec fastlane new_beta_release skip_confirm:true
19+
agents:
20+
queue: "tumblr-metal"

.buildkite/pipeline.yml

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
---
3+
14
# Nodes with values to reuse in the pipeline.
25
common_params:
3-
# Common plugin settings to use with the `plugins` key.
4-
- &ci_toolkit
5-
automattic/a8c-ci-toolkit#2.18.2
6-
- &test_collector
7-
test-collector#v1.8.0
86
- &test_collector_common_params
97
files: "buildkite-test-analytics/*.xml"
108
format: "junit"
@@ -19,7 +17,7 @@ steps:
1917
- label: "Gradle Wrapper Validation"
2018
command: |
2119
validate_gradle_wrapper
22-
plugins: [*ci_toolkit]
20+
plugins: [$CI_TOOLKIT]
2321

2422
# Wait for Gradle Wrapper to be validated before running any other jobs
2523
- wait
@@ -43,15 +41,15 @@ steps:
4341
command: |
4442
cp gradle.properties-example gradle.properties
4543
./gradlew checkstyle
46-
plugins: [*ci_toolkit]
44+
plugins: [$CI_TOOLKIT]
4745
artifact_paths:
4846
- "**/build/reports/checkstyle/checkstyle.*"
4947

5048
- label: "🕵️ detekt"
5149
command: |
5250
cp gradle.properties-example gradle.properties
5351
./gradlew detekt
54-
plugins: [*ci_toolkit]
52+
plugins: [$CI_TOOLKIT]
5553
artifact_paths:
5654
- "**/build/reports/detekt/detekt.html"
5755

@@ -70,7 +68,7 @@ steps:
7068
cp gradle.properties-example gradle.properties
7169
.buildkite/commands/dependency-tree-diff.sh
7270
if: build.pull_request.id != null
73-
plugins: [*ci_toolkit]
71+
plugins: [$CI_TOOLKIT]
7472

7573
#################
7674
# Unit Tests
@@ -80,8 +78,8 @@ steps:
8078
- label: "🔬 Unit Test WordPress"
8179
command: ".buildkite/commands/run-unit-tests.sh wordpress"
8280
plugins:
83-
- *ci_toolkit
84-
- *test_collector :
81+
- $CI_TOOLKIT
82+
- $TEST_COLLECTOR :
8583
<<: *test_collector_common_params
8684
api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_UNIT_TESTS_WORDPRESS"
8785
artifact_paths:
@@ -90,8 +88,8 @@ steps:
9088
- label: "🔬 Unit Test Processors"
9189
command: ".buildkite/commands/run-unit-tests.sh processors"
9290
plugins:
93-
- *ci_toolkit
94-
- *test_collector :
91+
- $CI_TOOLKIT
92+
- $TEST_COLLECTOR :
9593
<<: *test_collector_common_params
9694
api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_UNIT_TESTS_PROCESSORS"
9795
artifact_paths:
@@ -100,8 +98,8 @@ steps:
10098
- label: "🔬 Unit Test Image Editor"
10199
command: ".buildkite/commands/run-unit-tests.sh image-editor"
102100
plugins:
103-
- *ci_toolkit
104-
- *test_collector :
101+
- $CI_TOOLKIT
102+
- $TEST_COLLECTOR :
105103
<<: *test_collector_common_params
106104
api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_UNIT_TESTS_IMAGE_EDITOR"
107105
artifact_paths:
@@ -115,8 +113,8 @@ steps:
115113
- label: ":wordpress: 🔬 Instrumented tests"
116114
command: ".buildkite/commands/run-instrumented-tests.sh wordpress"
117115
plugins:
118-
- *ci_toolkit
119-
- *test_collector :
116+
- $CI_TOOLKIT
117+
- $TEST_COLLECTOR :
120118
<<: *test_collector_common_params
121119
api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_INSTRUMENTED_TESTS_WORDPRESS"
122120
artifact_paths:
@@ -125,8 +123,8 @@ steps:
125123
- label: ":jetpack: 🔬 Instrumented tests"
126124
command: ".buildkite/commands/run-instrumented-tests.sh jetpack"
127125
plugins:
128-
- *ci_toolkit
129-
- *test_collector :
126+
- $CI_TOOLKIT
127+
- $TEST_COLLECTOR :
130128
<<: *test_collector_common_params
131129
api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_INSTRUMENTED_TESTS_JETPACK"
132130
artifact_paths:
@@ -140,9 +138,9 @@ steps:
140138
- label: ":wordpress: :android: Prototype Build"
141139
command: ".buildkite/commands/prototype-build.sh wordpress"
142140
if: build.pull_request.id != null
143-
plugins: [*ci_toolkit]
141+
plugins: [$CI_TOOLKIT]
144142

145143
- label: ":jetpack: :android: Prototype Build"
146144
command: ".buildkite/commands/prototype-build.sh jetpack"
147145
if: build.pull_request.id != null
148-
plugins: [*ci_toolkit]
146+
plugins: [$CI_TOOLKIT]

.buildkite/release-builds.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
---
3+
14
# This pipeline is meant to be run via the Buildkite API, and is
25
# only used for release builds
36

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#2.17.0
7+
agents:
8+
queue: "android"
99

1010
steps:
1111
#################
@@ -15,7 +15,7 @@ steps:
1515
command: |
1616
validate_gradle_wrapper
1717
priority: 1
18-
plugins: *common_plugins
18+
plugins: [$CI_TOOLKIT]
1919

2020
# Wait for Gradle Wrapper to be validated before running any other jobs
2121
- wait
@@ -51,7 +51,7 @@ steps:
5151
command: ".buildkite/commands/release-build.sh wordpress"
5252
priority: 1
5353
depends_on: wplint
54-
plugins: *common_plugins
54+
plugins: [$CI_TOOLKIT]
5555
notify:
5656
- slack: "#build-and-ship"
5757

@@ -60,7 +60,7 @@ steps:
6060
command: ".buildkite/commands/release-build.sh jetpack"
6161
priority: 1
6262
depends_on: jplint
63-
plugins: *common_plugins
63+
plugins: [$CI_TOOLKIT]
6464
notify:
6565
- slack: "#build-and-ship"
6666

@@ -73,4 +73,4 @@ steps:
7373
- jpbuild
7474
command: ".buildkite/commands/create-github-release.sh"
7575
priority: 1
76-
plugins: *common_plugins
76+
plugins: [$CI_TOOLKIT]
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
---
3+
4+
agents:
5+
queue: "android"
6+
7+
steps:
8+
- label: "dependency analysis"
9+
command: |
10+
echo "--- 📊 Analyzing"
11+
cp gradle.properties-example gradle.properties
12+
./gradlew buildHealth
13+
plugins: [$CI_TOOLKIT]
14+
artifact_paths:
15+
- "build/reports/dependency-analysis/build-health-report.*"
16+
notify:
17+
- slack: "#android-core-notifs"
18+
if: build.state == "failed"

.buildkite/shared-pipeline-vars

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
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"
7+
export TEST_COLLECTOR="test-collector#v1.10.1"

0 commit comments

Comments
 (0)