Skip to content

Commit

Permalink
Merge pull request #25 from cultureamp/switching-to-main
Browse files Browse the repository at this point in the history
chore: cfparams is changing default branch to main
  • Loading branch information
therealvio authored May 10, 2023
2 parents f0b61f4 + 5acc7c5 commit 148a00c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 14 deletions.
13 changes: 2 additions & 11 deletions .buildkite/hooks/pre-command
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
#!/usr/bin/env sh
set -eou pipefail

if [ "$BUILDKITE_BRANCH" = "master" ]; then
branch_type="master"
build_agent="build-restricted"
else
branch_type="development"
build_agent="build-unrestricted"
fi

export BRANCH_TYPE="$branch_type"
export BUILD_ROLE="arn:aws:iam::226140413739:role/build-role-$branch_type-cfparams"
export BUILD_AGENT="$build_agent"
export BUILD_ROLE="arn:aws:iam::226140413739:role/build-role-master-cfparams"
export BUILD_AGENT="build-restricted"
4 changes: 2 additions & 2 deletions .buildkite/pipeline.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
steps:
- block: "Release build"
branches:
- master
- main
fields:
- select: "Prerelease?"
key: "release-type"
Expand All @@ -21,7 +21,7 @@ steps:

- label: ":github: Trigger release"
branches:
- master
- main
command: "bin/ci_trigger_release"
agents:
queue: ${BUILD_AGENT}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Release

on:
# Release from master branch will be triggered by Buildkite,
# Release from main branch will be triggered by Buildkite,
# passing a signing key and allowing a release-ready
# build to be created.
repository_dispatch:
Expand Down

0 comments on commit 148a00c

Please sign in to comment.