Skip to content

Commit 35fb743

Browse files
committed
fix coliding function names
1 parent 3eb4903 commit 35fb743

2 files changed

Lines changed: 13 additions & 11 deletions

File tree

scripts/release/publish-runners/bitbucket.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Run this in publish step after all version information have been updated.
44
set -ev
55

6-
setup() (
6+
setup_bitbucket() (
77
rm -rf bitbucketMetadataUpdates
88
mkdir -p bitbucketMetadataUpdates
99
git clone "https://${BITBUCKET_USERNAME}:${BITBUCKET_TOKEN}@bitbucket.org/launchdarkly/ld-find-code-refs-pipe.git" bitbucketMetadataUpdates
@@ -17,25 +17,27 @@ setup() (
1717
git remote add bb-origin "https://${BITBUCKET_USERNAME}:${BITBUCKET_TOKEN}@bitbucket.org/launchdarkly/ld-find-code-refs-pipe.git"
1818
)
1919

20-
clean_up() (
20+
clean_up_bitbucket() (
2121
cd .. && rm -rf bitbucketMetadataUpdates
2222
)
2323

2424
publish_bitbucket() (
25-
setup
25+
setup_bitbucket
2626

2727
echo "Live run: will publish pipe to bitbucket."
2828
git tag $LD_RELEASE_VERSION
2929
git push bb-origin master --tags
3030

31-
clean_up
31+
clean_up_bitbucket
3232
)
3333

3434
dry_run_bitbucket() (
35-
setup
35+
setup_bitbucket
3636

3737
echo "Dry run: will not publish pipe to bitbucket."
38-
git push origin main --tags --dry-run
38+
git show-ref
39+
git remote -v
40+
git push bb-origin master --tags --dry-run
3941

40-
clean_up
42+
clean_up_bitbucket
4143
)

scripts/release/publish-runners/gha.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RELEASE_NOTES="$(make echo-release-notes)"
1010
VERSION_MAJOR="${LD_RELEASE_VERSION%%\.*}"
1111
RELEASE_TAG_MAJOR="v${VERSION_MAJOR}"
1212

13-
setup() (
13+
setup_gha() (
1414
# install gh cli so we can create a release later https://github.com/cli/cli/blob/trunk/docs/install_linux.md
1515
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
1616
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
@@ -32,12 +32,12 @@ setup() (
3232
pwd
3333
)
3434

35-
clean_up() (
35+
clean_up_gha() (
3636
cd .. && rm -rf githubActionsMetadataUpdates
3737
)
3838

3939
publish_gha() (
40-
setup
40+
setup_gha
4141

4242
echo "Live run: will publish action to github action marketplace."
4343
# tag the commit with the release version and create release
@@ -58,5 +58,5 @@ dry_run_gha() (
5858
git show-ref
5959
git push origin main --tags --dry-run
6060

61-
clean_up
61+
clean_up_gha
6262
)

0 commit comments

Comments
 (0)