Skip to content

Commit ed4e629

Browse files
authored
fix: Make sure our bot is used for released (#1116)
credentials
1 parent 8bf1526 commit ed4e629

File tree

5 files changed

+34
-12
lines changed

5 files changed

+34
-12
lines changed

Diff for: .changeset/config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"fixed": [],
99
"linked": [],
1010
"access": "public",
11-
"baseBranch": "main",
11+
"baseBranch": "origin/main",
1212
"updateInternalDependencies": "patch",
1313
"ignore": [
1414
"@react-native-async-storage/eslint-config",

Diff for: .github/scripts/setup-ci-git-user.sh

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/sh
2+
3+
if [ -z ${CI+x} ]
4+
then
5+
# not on CI
6+
exit 0
7+
fi
8+
9+
if [ -z ${GITHUB_NAME+x} ] || [ -z ${GITHUB_EMAIL+x} ] || [ -z ${GITHUB_TOKEN+x} ]
10+
then
11+
echo "Make sure GITHUB_NAME, GITHUB_EMAIL and GITHUB_TOKEN variables are set"
12+
exit 1
13+
fi
14+
15+
git config --global user.name "$GITHUB_NAME"
16+
git config --global user.email "$GITHUB_EMAIL"
17+
echo "machine github.com login $GITHUB_NAME password $GITHUB_TOKEN" > ~/.netrc
18+
19+

Diff for: .github/workflows/release.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ jobs:
1212
uses: ./.github/actions/setup-project
1313
- name: Install dependencies
1414
run: yarn
15-
- name: Setup git user
16-
run: |
17-
git config --global user.name ${{ secrets.GH_BOT_NAME }}
18-
git config --global user.email ${{ secrets.GH_BOT_EMAIL }}
1915
- name: Version or release packages
2016
uses: changesets/action@v1
2117
with:
@@ -26,4 +22,6 @@ jobs:
2622
version: "yarn release:version"
2723
env:
2824
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_TOKEN }}
25+
GITHUB_NAME: ${{ secrets.GH_BOT_NAME }}
26+
GITHUB_EMAIL: ${{ secrets.GH_BOT_EMAIL }}
2927
NPM_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}

Diff for: .github/workflows/website-deployment.yml

+10-5
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,15 @@ jobs:
1919
- name: Install dependencies
2020
run: yarn
2121
working-directory: ./packages/website
22+
- name: Setup git user
23+
run: setup-ci-git-user.sh
24+
working-directory: ./.github/scripts
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_TOKEN }}
27+
GITHUB_NAME: ${{ secrets.GH_BOT_NAME }}
28+
GITHUB_EMAIL: ${{ secrets.GH_BOT_EMAIL }}
2229
- name: Deploy
23-
run: |
24-
git config --global user.name ${{ secrets.GH_BOT_NAME }}
25-
git config --global user.email ${{ secrets.GH_BOT_EMAIL }}
26-
echo "machine github.com login ${{ secrets.GH_BOT_NAME }} password ${{ secrets.GH_RELEASE_TOKEN }}" > ~/.netrc
27-
GIT_USER=${{ secrets.GH_BOT_NAME }} yarn run deploy
30+
env:
31+
GIT_USER: ${{ secrets.GH_BOT_NAME }}
32+
run: yarn run deploy
2833
working-directory: ./packages/website

Diff for: package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"test:lint": "turbo run test:lint",
1717
"test:ts": "turbo run test:ts",
1818
"test:format": "prettier --check --loglevel warn $(git ls-files '*.js' '*.json' '*.ts' '*.tsx' '*.yml' 'README.md')",
19-
"release:version": "changeset version",
20-
"release:publish": "changeset publish"
19+
"release:version": "./.github/scripts/setup-ci-git-user.sh && changeset version",
20+
"release:publish": "./.github/scripts/setup-ci-git-user.sh && changeset publish"
2121
},
2222
"devDependencies": {
2323
"@changesets/changelog-github": "^0.5.0",

0 commit comments

Comments
 (0)