Skip to content

Commit b2c706c

Browse files
cbesscbess
committed
Merge branch 'develop' into ul-indent-styles
2 parents 49a5925 + 259342a commit b2c706c

File tree

86 files changed

+1326
-703
lines changed

Some content is hidden

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

86 files changed

+1326
-703
lines changed

‎.buildkite/pipeline.yml‎

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,72 @@
1-
# Nodes with values to reuse in the pipeline.
2-
common_params:
3-
plugins: &common_plugins
4-
- automattic/a8c-ci-toolkit#2.13.0
5-
# Common environment values to use with the `env` key.
6-
env: &common_env
7-
IMAGE_ID: xcode-13
1+
agents:
2+
queue: mac
3+
env:
4+
IMAGE_ID: $IMAGE_ID
85

96
# This is the default pipeline – it will build and test the app
107
steps:
118
#################
129
# Build and Test
1310
#################
14-
- label: "🧪 Build and Test"
15-
key: "test"
16-
command: |
17-
build_and_test_pod
18-
env: *common_env
19-
plugins: *common_plugins
11+
- label: 🧪 Build and Test
12+
key: test
13+
command: build_and_test_pod
14+
plugins: [$CI_TOOLKIT_PLUGIN]
15+
notify:
16+
- github_commit_status:
17+
context: Unit Tests
2018

2119
#################
2220
# Validate Podspecs
2321
#################
24-
- label: "🔬 Validate Podspecs"
25-
key: "validate"
26-
command: |
27-
validate_podspec
28-
env: *common_env
29-
plugins: *common_plugins
22+
- label: 🔬 Validate Podspecs
23+
key: validate
24+
# Ideally, --allow-warnings should be removed once the warnings have been addressed
25+
command: validate_podspec --patch-cocoapods --allow-warnings
26+
plugins: [$CI_TOOLKIT_PLUGIN]
27+
notify:
28+
- github_commit_status:
29+
context: Validate Podspecs
3030

3131
#################
3232
# Lint
3333
#################
34-
- label: "🧹 Lint"
35-
key: "lint"
36-
command: |
37-
lint_pod
38-
env: *common_env
39-
plugins: *common_plugins
34+
- label: 🧹 Lint
35+
key: lint
36+
command: lint_pod
37+
plugins: [$CI_TOOLKIT_PLUGIN]
38+
notify:
39+
- github_commit_status:
40+
context: Lint Pod
4041

4142
#################
4243
# Publish the Podspec (if we're building a tag)
4344
#################
44-
- label: "⬆️ Publish Aztec Podspec"
45-
key: "publish-aztec"
45+
- label: ⬆️ Publish Aztec Podspec
46+
key: publish-aztec
4647
command: .buildkite/publish-aztec-pod.sh
47-
env: *common_env
48-
plugins: *common_plugins
48+
plugins: [$CI_TOOLKIT_PLUGIN]
4949
depends_on:
50-
- "test"
51-
- "validate"
52-
- "lint"
50+
- test
51+
- validate
52+
- lint
5353
if: build.tag != null
54-
agents:
55-
queue: "mac"
54+
notify:
55+
- github_commit_status:
56+
context: Publish Aztec Podspec
5657

5758
#################
5859
# Publish the Podspec (if we're building a tag)
5960
#################
60-
- label: "⬆️ Publish Editor Podspec"
61-
key: "publish-editor"
61+
- label: ⬆️ Publish Editor Podspec
62+
key: publish-editor
6263
command: .buildkite/publish-editor-pod.sh
63-
env: *common_env
64-
plugins: *common_plugins
64+
plugins: [$CI_TOOLKIT_PLUGIN]
6565
depends_on:
66-
- "test"
67-
- "validate"
68-
- "lint"
66+
- test
67+
- validate
68+
- lint
6969
if: build.tag != null
70-
agents:
71-
queue: "mac"
70+
notify:
71+
- github_commit_status:
72+
context: Publish WordPress-Editor Podspec

‎.buildkite/publish-aztec-pod.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ echo "--- :rubygems: Setting up Gems"
88
install_gems
99

1010
echo "--- :cocoapods: Publishing Pod to CocoaPods CDN"
11-
publish_pod $PODSPEC_PATH
11+
# Using `--synchronous` here because Editor depends on Aztec, and we need
12+
# to be able to `pod trunk push` the Editor pod immediately after the Aztec
13+
# pod has been published, without being hindered by the CDN propagation time.
14+
publish_pod --synchronous $PODSPEC_PATH
1215

1316
echo "--- :cocoapods: Publishing Pod to WP Specs Repo"
1417
publish_private_pod $PODSPEC_PATH $SPECS_REPO "$SPEC_REPO_PUBLIC_DEPLOY_KEY"

.buildkite/publish-editor.pod.sh renamed to .buildkite/publish-editor-pod.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ echo "--- :rubygems: Setting up Gems"
88
install_gems
99

1010
echo "--- :cocoapods: Publishing Pod to CocoaPods CDN"
11-
publish_pod $PODSPEC_PATH
11+
# Using `--synchronous` here because Editor depends on Aztec, and we need
12+
# to be able to `pod trunk push` the Editor pod immediately after the Aztec
13+
# pod has been published, without being hindered by the CDN propagation time.
14+
publish_pod --synchronous $PODSPEC_PATH
1215

1316
echo "--- :cocoapods: Publishing Pod to WP Specs Repo"
1417
publish_private_pod $PODSPEC_PATH $SPECS_REPO "$SPEC_REPO_PUBLIC_DEPLOY_KEY"

‎.buildkite/shared-pipeline-vars‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
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+
# The ~> modifier is not currently used, but we check for it just in case
7+
XCODE_VERSION=$(sed -E 's/^~> ?//' .xcode-version)
8+
CI_TOOLKIT_PLUGIN_VERSION="3.8.0"
9+
10+
export IMAGE_ID="xcode-$XCODE_VERSION-macos-14.7.1-v1"
11+
export CI_TOOLKIT_PLUGIN="automattic/a8c-ci-toolkit#$CI_TOOLKIT_PLUGIN_VERSION"

‎.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.4
1+
3.2.2

‎.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.swiftpm/xcode/xcshareddata/xcschemes/Aztec.xcscheme‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1500"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "Aztec"
18+
BuildableName = "Aztec"
19+
BlueprintName = "Aztec"
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
shouldAutocreateTestPlan = "YES">
31+
</TestAction>
32+
<LaunchAction
33+
buildConfiguration = "Debug"
34+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
35+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
36+
launchStyle = "0"
37+
useCustomWorkingDirectory = "NO"
38+
ignoresPersistentStateOnLaunch = "NO"
39+
debugDocumentVersioning = "YES"
40+
debugServiceExtension = "internal"
41+
allowLocationSimulation = "YES">
42+
</LaunchAction>
43+
<ProfileAction
44+
buildConfiguration = "Release"
45+
shouldUseLaunchSchemeArgsEnv = "YES"
46+
savedToolIdentifier = ""
47+
useCustomWorkingDirectory = "NO"
48+
debugDocumentVersioning = "YES">
49+
<MacroExpansion>
50+
<BuildableReference
51+
BuildableIdentifier = "primary"
52+
BlueprintIdentifier = "Aztec"
53+
BuildableName = "Aztec"
54+
BlueprintName = "Aztec"
55+
ReferencedContainer = "container:">
56+
</BuildableReference>
57+
</MacroExpansion>
58+
</ProfileAction>
59+
<AnalyzeAction
60+
buildConfiguration = "Debug">
61+
</AnalyzeAction>
62+
<ArchiveAction
63+
buildConfiguration = "Release"
64+
revealArchiveInOrganizer = "YES">
65+
</ArchiveAction>
66+
</Scheme>

‎.swiftpm/xcode/xcshareddata/xcschemes/WordPress-AztecEditor-iOS-Package.xcscheme‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1500"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "Aztec"
18+
BuildableName = "Aztec"
19+
BlueprintName = "Aztec"
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "YES"
26+
buildForProfiling = "YES"
27+
buildForArchiving = "YES"
28+
buildForAnalyzing = "YES">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "WordPressEditor"
32+
BuildableName = "WordPressEditor"
33+
BlueprintName = "WordPressEditor"
34+
ReferencedContainer = "container:">
35+
</BuildableReference>
36+
</BuildActionEntry>
37+
<BuildActionEntry
38+
buildForTesting = "YES"
39+
buildForRunning = "YES"
40+
buildForProfiling = "NO"
41+
buildForArchiving = "NO"
42+
buildForAnalyzing = "YES">
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "AztecTests"
46+
BuildableName = "AztecTests"
47+
BlueprintName = "AztecTests"
48+
ReferencedContainer = "container:">
49+
</BuildableReference>
50+
</BuildActionEntry>
51+
<BuildActionEntry
52+
buildForTesting = "YES"
53+
buildForRunning = "YES"
54+
buildForProfiling = "NO"
55+
buildForArchiving = "NO"
56+
buildForAnalyzing = "YES">
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "WordPressEditorTests"
60+
BuildableName = "WordPressEditorTests"
61+
BlueprintName = "WordPressEditorTests"
62+
ReferencedContainer = "container:">
63+
</BuildableReference>
64+
</BuildActionEntry>
65+
</BuildActionEntries>
66+
</BuildAction>
67+
<TestAction
68+
buildConfiguration = "Debug"
69+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
70+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
71+
shouldUseLaunchSchemeArgsEnv = "YES"
72+
shouldAutocreateTestPlan = "YES">
73+
<Testables>
74+
<TestableReference
75+
skipped = "NO">
76+
<BuildableReference
77+
BuildableIdentifier = "primary"
78+
BlueprintIdentifier = "AztecTests"
79+
BuildableName = "AztecTests"
80+
BlueprintName = "AztecTests"
81+
ReferencedContainer = "container:">
82+
</BuildableReference>
83+
</TestableReference>
84+
<TestableReference
85+
skipped = "NO">
86+
<BuildableReference
87+
BuildableIdentifier = "primary"
88+
BlueprintIdentifier = "WordPressEditorTests"
89+
BuildableName = "WordPressEditorTests"
90+
BlueprintName = "WordPressEditorTests"
91+
ReferencedContainer = "container:">
92+
</BuildableReference>
93+
</TestableReference>
94+
</Testables>
95+
</TestAction>
96+
<LaunchAction
97+
buildConfiguration = "Debug"
98+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
99+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
100+
launchStyle = "0"
101+
useCustomWorkingDirectory = "NO"
102+
ignoresPersistentStateOnLaunch = "NO"
103+
debugDocumentVersioning = "YES"
104+
debugServiceExtension = "internal"
105+
allowLocationSimulation = "YES">
106+
</LaunchAction>
107+
<ProfileAction
108+
buildConfiguration = "Release"
109+
shouldUseLaunchSchemeArgsEnv = "YES"
110+
savedToolIdentifier = ""
111+
useCustomWorkingDirectory = "NO"
112+
debugDocumentVersioning = "YES">
113+
<MacroExpansion>
114+
<BuildableReference
115+
BuildableIdentifier = "primary"
116+
BlueprintIdentifier = "Aztec"
117+
BuildableName = "Aztec"
118+
BlueprintName = "Aztec"
119+
ReferencedContainer = "container:">
120+
</BuildableReference>
121+
</MacroExpansion>
122+
</ProfileAction>
123+
<AnalyzeAction
124+
buildConfiguration = "Debug">
125+
</AnalyzeAction>
126+
<ArchiveAction
127+
buildConfiguration = "Release"
128+
revealArchiveInOrganizer = "YES">
129+
</ArchiveAction>
130+
</Scheme>

0 commit comments

Comments
 (0)