Skip to content

Commit 3a510a9

Browse files
authored
fix: restore step order in dev-multidev script from #841
1 parent eaefff1 commit 3a510a9

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

.ci/deploy/pantheon/dev-multidev

+6-7
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@ set -eo pipefail
1111
# Authenticate with Terminus
1212
terminus -n auth:login --machine-token="$TERMINUS_TOKEN"
1313

14-
# Ensure secrets are set
15-
terminus -n secrets:set "$TERMINUS_SITE.$TERMINUS_ENV" token "${GH_TOKEN:-$GITHUB_TOKEN}" --file='.build-secrets/tokens.json' --clear --skip-if-empty
16-
17-
# Delete old multidev environments associated
18-
# with a PR that has been merged or closed.
19-
terminus -n build:env:delete:pr "$TERMINUS_SITE" --yes
20-
2114
if [[ "$CI_BRANCH" != "$DEFAULT_BRANCH" ]]
2215
then
2316
# Create a new multidev environment (or push to an existing one)
@@ -35,3 +28,9 @@ terminus -n drush "$TERMINUS_SITE.$TERMINUS_ENV" -- deploy -v -y
3528

3629
# Clear the environment cache
3730
terminus -n env:clear-cache "$TERMINUS_SITE.$TERMINUS_ENV"
31+
32+
# Ensure secrets are set
33+
terminus -n secrets:set "$TERMINUS_SITE.$TERMINUS_ENV" token "${GH_TOKEN:-$GITHUB_TOKEN}" --file='.build-secrets/tokens.json' --clear --skip-if-empty
34+
# Delete old multidev environments associated
35+
# with a PR that has been merged or closed.
36+
terminus -n build:env:delete:pr "$TERMINUS_SITE" --yes

0 commit comments

Comments
 (0)