Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Commit e9f7695

Browse files
committed
Merge branch 'trunk' into refactor-oauth-error
2 parents 7dfe292 + 8f8a8c6 commit e9f7695

File tree

5 files changed

+12
-22
lines changed

5 files changed

+12
-22
lines changed

.buildkite/pipeline.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Nodes with values to reuse in the pipeline.
22
common_params:
33
plugins: &common_plugins
4-
- automattic/a8c-ci-toolkit#2.18.2
4+
- automattic/a8c-ci-toolkit#3.0.1
55
# Common environment values to use with the `env` key.
66
env: &common_env
77
IMAGE_ID: xcode-15.0.1
@@ -25,16 +25,10 @@ steps:
2525
#################
2626
# Validate Podspec
2727
#################
28-
- label: "🔬 Validate Podspec – ⚠️ Bypassed ⚠️"
28+
- label: "🔬 Validate Podspec"
2929
key: "validate"
3030
command: |
31-
# validate_podspec
32-
echo '+++ ⚠️ validate_podspec was bypassed ⚠️'
33-
# post a message in the logs
34-
cat .buildkite/validate_podspec_annotation.md
35-
# and also as an annotation
36-
cat .buildkite/validate_podspec_annotation.md | buildkite-agent annotate --style 'warning'
37-
key: "validate"
31+
validate_podspec --patch-cocoapods
3832
env: *common_env
3933
plugins: *common_plugins
4034

.buildkite/publish-pod.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +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+
publish_pod --patch-cocoapods $PODSPEC_PATH
1212

1313
echo "--- :cocoapods: Publishing Pod to WP Specs Repo"
14-
publish_private_pod $PODSPEC_PATH $SPECS_REPO "$SPEC_REPO_PUBLIC_DEPLOY_KEY"
14+
publish_private_pod --patch-cocoapods $PODSPEC_PATH $SPECS_REPO "$SPEC_REPO_PUBLIC_DEPLOY_KEY"
1515

1616
echo "--- :slack: Notifying Slack"
1717
slack_notify_pod_published $PODSPEC_PATH "$SLACK_WEBHOOK"

.buildkite/validate_podspec_annotation.md

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

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ _None._
3838

3939
### New Features
4040

41-
_None._
41+
- `WordPressOrgXMLRPCValidatorError` now conforms to `LocalizedError` [#649]
4242

4343
### Bug Fixes
4444

WordPressKit/WordPressOrgXMLRPCValidator.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ import Foundation
3535
}
3636
}
3737

38+
extension WordPressOrgXMLRPCValidatorError: LocalizedError {
39+
public var errorDescription: String? {
40+
localizedDescription
41+
}
42+
}
43+
3844
/// An WordPressOrgXMLRPCValidator is able to validate and check if user provided site urls are
3945
/// WordPress XMLRPC sites.
4046
open class WordPressOrgXMLRPCValidator: NSObject {

0 commit comments

Comments
 (0)