Skip to content

Commit f343037

Browse files
authored
feat: add in verified CI bot (#26)
1 parent 51b5d2a commit f343037

File tree

3 files changed

+29
-10
lines changed

3 files changed

+29
-10
lines changed

.github/workflows/release.yml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,24 @@ jobs:
1919
name: "Create Release Branch"
2020
runs-on: ubuntu-18.04
2121
needs: confirm-public-repo-main-branch
22+
env:
23+
GITHUB_TOKEN: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
24+
GIT_AUTHOR_NAME: mparticle-automation
25+
GIT_AUTHOR_EMAIL: [email protected]
26+
GIT_COMMITTER_NAME: mparticle-automation
27+
GIT_COMMITTER_EMAIL: [email protected]
2228
steps:
2329
- name: "Checkout next release branch"
2430
uses: actions/checkout@v2
2531
with:
2632
ref: development
27-
token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
33+
- name: "Import GPG Key"
34+
uses: crazy-max/ghaction-import-gpg@v4
35+
with:
36+
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
37+
passphrase: ${{ secrets.GPG_PASSPHRASE }}
38+
git_user_signingkey: true
39+
git_commit_gpgsign: true
2840
- name: "Create and push release branch"
2941
run: |
3042
git checkout -b release/${{ github.run_number }}
@@ -38,16 +50,23 @@ jobs:
3850
runs-on: macos-11
3951
env:
4052
GITHUB_TOKEN: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
41-
GIT_AUTHOR_NAME: mparticle-bot
53+
GIT_AUTHOR_NAME: mparticle-automation
4254
GIT_AUTHOR_EMAIL: [email protected]
43-
GIT_COMMITTER_NAME: mparticle-bot
55+
GIT_COMMITTER_NAME: mparticle-automation
4456
GIT_COMMITTER_EMAIL: [email protected]
4557
steps:
4658
- name: "Checkout public main branch"
4759
uses: actions/checkout@v2
4860
with:
4961
fetch-depth: 0
5062
ref: main
63+
- name: "Import GPG Key"
64+
uses: crazy-max/ghaction-import-gpg@v4
65+
with:
66+
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
67+
passphrase: ${{ secrets.GPG_PASSPHRASE }}
68+
git_user_signingkey: true
69+
git_commit_gpgsign: true
5170
- name: "Install JDK 11"
5271
uses: actions/setup-java@v2
5372
with:

core-sdk-samples/higgs-shop-sample-app/app/src/main/res/layout/fragment_account.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
style="@style/Theme.mParticle.SampleApp.TextInputLayout"
3131
android:layout_width="342dp"
3232
android:layout_height="54dp"
33-
android:hint="@string/account_username_header">
33+
android:hint="@string/account_user_header">
3434
<com.google.android.material.textfield.TextInputEditText
3535
style="@style/Theme.mParticle.SampleApp.TextInputEditText"
3636
android:textIsSelectable="false"
3737
android:enabled="false"
38-
android:text="@string/account_username_value"
38+
android:text="@string/account_user_value"
3939
android:layout_width="match_parent"
4040
android:layout_height="wrap_content"/>
4141
</com.google.android.material.textfield.TextInputLayout>
@@ -51,7 +51,7 @@
5151
<TextView
5252
android:layout_width="342dp"
5353
android:layout_height="24dp"
54-
android:text="@string/account_username_header2"
54+
android:text="@string/account_user_header2"
5555
android:gravity="center"
5656
android:textColor="@color/white"
5757
android:textStyle="bold"
@@ -64,7 +64,7 @@
6464
android:gravity="center"
6565
android:paddingTop="10dp"
6666
android:textColor="@color/gray_999999"
67-
android:text="@string/account_username_value"
67+
android:text="@string/account_user_value"
6868
android:textSize="16sp"
6969
android:fontFamily="@font/lato_regular"
7070
/>

core-sdk-samples/higgs-shop-sample-app/app/src/main/res/values/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737

3838
<!-- account -->
3939
<string name="account_title">My Account</string>
40-
<string name="account_username_header">Username</string>
41-
<string name="account_username_value">MyHiggsId</string>
42-
<string name="account_username_header2">You are signed in as</string>
40+
<string name="account_user_header">User ID</string>
41+
<string name="account_user_value">MyHiggsId</string>
42+
<string name="account_user_header2">You are signed in as</string>
4343
<string name="account_cta_login">Sign In*</string>
4444
<string name="account_cta_logout">Sign Out*</string>
4545
<string name="account_disclaimer">*Demonstration only</string>

0 commit comments

Comments
 (0)