Skip to content

Commit 2e64538

Browse files
authored
Merge pull request #1067 from Automattic/use/buildkite
Use Buildkite for CI
2 parents b5c2e5f + 3678cfc commit 2e64538

File tree

7 files changed

+96
-90
lines changed

7 files changed

+96
-90
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#! /bin/bash
2+
3+
set -eu
4+
5+
# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM
6+
echo "--- :rubygems: Fixing Ruby Setup"
7+
gem install bundler
8+
9+
echo "--- :rubygems: Setting up Gems"
10+
install_gems
11+
12+
echo "--- :cocoapods: Setting up Pods"
13+
install_cocoapods
14+
15+
echo "--- :hammer_and_wrench: Build and Test"
16+
bundle exec fastlane test_app_store_build

.buildkite/commands/build-and-test.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#! /bin/bash
2+
3+
set -eu
4+
5+
# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM
6+
echo "--- :rubygems: Fixing Ruby Setup"
7+
gem install bundler
8+
9+
echo "--- :rubygems: Setting up Gems"
10+
install_gems
11+
12+
echo "--- :cocoapods: Setting up Pods"
13+
install_cocoapods
14+
15+
echo "--- :hammer_and_wrench: Build and Test"
16+
bundle exec fastlane test
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#! /bin/bash
2+
3+
set -eu
4+
5+
# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM
6+
echo "--- :rubygems: Fixing Ruby Setup"
7+
gem install bundler
8+
9+
echo "--- :rubygems: Setting up Gems"
10+
install_gems
11+
12+
echo "--- :cocoapods: Setting up Pods"
13+
install_cocoapods
14+
15+
echo "--- :hammer_and_wrench: Build and Test"
16+
bundle exec fastlane build_and_upload_app_store create_github_release:true

.buildkite/pipeline.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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/bash-cache#2.6.0
6+
# Common environment values to use with the `env` key.
7+
- &common_env
8+
# Remember to address all "FIXIT-13.1" comments when we'll update to new image.
9+
#
10+
# `xcode-13.4.1` note: The issue "FIXIT-13.1" addresses is still there in this image.
11+
# See: https://buildkite.com/automattic/wordpress-ios/builds/8187#01813c28-1c1d-4a25-95c0-0fdd6f2af399
12+
IMAGE_ID: xcode-13.4.1
13+
14+
# This is the default pipeline – it will build and test the app
15+
steps:
16+
- label: "🔬 Build and Test"
17+
command: .buildkite/commands/build-and-test.sh
18+
env: *common_env
19+
plugins: *common_plugins
20+
21+
- label: "🛠 Verify App Store Target Builds"
22+
command: .buildkite/commands/build-and-test-app-store.sh
23+
env: *common_env
24+
plugins: *common_plugins

.buildkite/release-build.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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/bash-cache#2.6.0
6+
# Common environment values to use with the `env` key.
7+
- &common_env
8+
# Remember to address all "FIXIT-13.1" comments when we'll update to new image.
9+
#
10+
# `xcode-13.4.1` note: The issue "FIXIT-13.1" addresses is still there in this image.
11+
# See: https://buildkite.com/automattic/wordpress-ios/builds/8187#01813c28-1c1d-4a25-95c0-0fdd6f2af399
12+
IMAGE_ID: xcode-13.4.1
13+
14+
# This is the default pipeline – it will build and test the app
15+
steps:
16+
- label: "🛠 App Store Upload"
17+
command: .buildkite/commands/build-and-upload-release.sh
18+
env: *common_env
19+
plugins: *common_plugins

.circleci/config.yml

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

fastlane/Fastfile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -410,12 +410,10 @@ end
410410
# bundle exec fastlane trigger_release_build [branch_to_build:<branch_name>]
411411
#############################################################################
412412
lane :trigger_release_build do | options |
413-
circleci_trigger_job(
414-
circle_ci_token: ENV["CIRCLE_CI_AUTH_TOKEN"],
415-
repository: REPOSITORY_NAME,
416-
organization: ORGANIZATION_NAME,
417-
branch: options[:branch_to_build],
418-
job_params: { app_store_build: true }
413+
buildkite_trigger_build(
414+
buildkite_organization: 'automattic',
415+
buildkite_pipeline: 'simplenote-macos',
416+
branch: options[:branch_to_build] || git_branch,
417+
pipeline_file: 'release-builds.yml'
419418
)
420419
end
421-

0 commit comments

Comments
 (0)