Skip to content

Commit a0d6417

Browse files
tal-mital-mi
committed
Merge branch 'feat/CXCDC-35027-Github_actions_optimization' into develop
2 parents 4252b25 + 8b5840f commit a0d6417

File tree

3 files changed

+329
-59
lines changed

3 files changed

+329
-59
lines changed

‎.github/workflows/bits&bytes_develop_debug.yml‎

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020

2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
with:
2525
ref: ${{ github.event.inputs.branch }}
2626

2727
- name: Set up JDK 17
28-
uses: actions/setup-java@v3
28+
uses: actions/setup-java@v4
2929
with:
3030
distribution: 'zulu'
3131
java-version: '17'
@@ -34,14 +34,7 @@ jobs:
3434
run: |
3535
sed -i '/signingConfigs {/,/}/c\signingConfigs {\n\n getByName("debug") {\n keyAlias = "${{ secrets.BITS_N_BYTES_DEBUG_KEY_ALIAS }}"\n keyPassword = "${{ secrets.BITS_N_BYTES_DEBUG_KEY_PASSWORD }}"\n storeFile = file("keystore/debug")\n storePassword = "${{ secrets.BITS_N_BYTES_DEBUG_STORE_PASSWORD }}"\n }\n' app/build.gradle.kts
3636
37-
- name: Add API keys/domains tags to strings.xml resource (demo.variant)
38-
run: |
39-
sed -i '/<\/resources>/i \ <string name="com.sap.cxcdc.apikey">${{ secrets.BITS_N_BYTES_DEMO_API_KEY }}</string>' app/src/main/res/values/strings.xml
40-
sed -i '/<\/resources>/i \ <string name="com.sap.cxcdc.domain">us1.gigya.com</string>' app/src/main/res/values/strings.xml
41-
sed -i '/<\/resources>/i \ <string name="com.sap.cxcdc.apikey">${{ secrets.BITS_N_BYTES_VARIANT_API_KEY }}</string>' app/src/variant/res/values/strings.xml
42-
sed -i '/<\/resources>/i \ <string name="com.sap.cxcdc.domain">us1.gigya.com</string>' app/src/variant/res/values/strings.xml
43-
44-
- name: Helper to upsert a <string> in strings.xml
37+
- name: Configure string resources using helper
4538
shell: bash
4639
run: |
4740
upsert_string () {
@@ -57,32 +50,35 @@ jobs:
5750
' "$file" > "$file.tmp" && mv "$file.tmp" "$file"
5851
}
5952
53+
# API keys/domains for demo.variant
54+
upsert_string app/src/main/res/values/strings.xml "com.sap.cxcdc.apikey" '${{ secrets.BITS_N_BYTES_DEMO_API_KEY }}'
55+
upsert_string app/src/main/res/values/strings.xml "com.sap.cxcdc.domain" 'us1.gigya.com'
56+
upsert_string app/src/variant/res/values/strings.xml "com.sap.cxcdc.apikey" '${{ secrets.BITS_N_BYTES_VARIANT_API_KEY }}'
57+
upsert_string app/src/variant/res/values/strings.xml "com.sap.cxcdc.domain" 'us1.gigya.com'
58+
59+
# Asset statements
6060
upsert_string app/src/main/res/values/strings.xml "asset_statements" '${{ secrets.BITS_N_BYTES_ASSET_STATEMENTS }}'
6161
upsert_string app/src/variant/res/values/strings.xml "asset_statements" '${{ secrets.BITS_N_BYTES_ASSET_STATEMENTS }}'
6262
63-
- name: Add Google required resources to strings.xml resource (actual value for demo only)
64-
run: |
65-
sed -i '/<\/resources>/i \ <string name="google_server_client_id">${{ secrets.GOOGLE_WEB_SERVER_CLIENT_ID }}</string>' app/src/main/res/values/strings.xml
66-
sed -i '/<\/resources>/i \ <string name="google_server_client_id">GOOGLE_WEB_CLIENT_ID_HERE</string>' app/src/variant/res/values/strings.xml
67-
68-
- name: Add Facebook required resources to strings.xml resource (actual value for demo only)
69-
run: |
70-
sed -i '/<\/resources>/i \ <string name="facebook_app_id">FB_APP_ID_HERE</string>' app/src/main/res/values/strings.xml
71-
sed -i '/<\/resources>/i \ <string name="fb_login_protocol_scheme">FB_LOGIN_PROTOCOL_SCHEME_HERE</string>' app/src/main/res/values/strings.xml
72-
sed -i '/<\/resources>/i \ <string name="facebook_client_token">FB_CLIENT_TOKEN_HERE</string>' app/src/main/res/values/strings.xml
73-
sed -i '/<\/resources>/i \ <string name="facebook_app_id">FB_APP_ID_HERE</string>' app/src/variant/res/values/strings.xml
74-
sed -i '/<\/resources>/i \ <string name="fb_login_protocol_scheme">FB_LOGIN_PROTOCOL_SCHEME_HERE</string>' app/src/variant/res/values/strings.xml
75-
sed -i '/<\/resources>/i \ <string name="facebook_client_token">FB_CLIENT_TOKEN_HERE</string>' app/src/variant/res/values/strings.xml
76-
77-
- name: Add Line required resources to strings.xml resource (actual value for demo only)
78-
run: |
79-
sed -i '/<\/resources>/i \ <string name="line_channel_id">LINE_CHANNEL_ID_HERE</string>' app/src/main/res/values/strings.xml
80-
sed -i '/<\/resources>/i \ <string name="line_channel_id">LINE_CHANNEL_ID_HERE</string>' app/src/variant/res/values/strings.xml
81-
82-
- name: Add WeChat required resources to strings.xml resource (actual value for demo only)
83-
run: |
84-
sed -i '/<\/resources>/i \ <string name="wechat_app_id">WECHAT_APP_ID_HERE</string>' app/src/main/res/values/strings.xml
85-
sed -i '/<\/resources>/i \ <string name="wechat_app_id">WECHAT_APP_ID_HERE</string>' app/src/variant/res/values/strings.xml
63+
# Google resources
64+
upsert_string app/src/main/res/values/strings.xml "google_server_client_id" '${{ secrets.GOOGLE_WEB_SERVER_CLIENT_ID }}'
65+
upsert_string app/src/variant/res/values/strings.xml "google_server_client_id" 'GOOGLE_WEB_CLIENT_ID_HERE'
66+
67+
# Facebook resources
68+
upsert_string app/src/main/res/values/strings.xml "facebook_app_id" 'FB_APP_ID_HERE'
69+
upsert_string app/src/main/res/values/strings.xml "fb_login_protocol_scheme" 'FB_LOGIN_PROTOCOL_SCHEME_HERE'
70+
upsert_string app/src/main/res/values/strings.xml "facebook_client_token" 'FB_CLIENT_TOKEN_HERE'
71+
upsert_string app/src/variant/res/values/strings.xml "facebook_app_id" 'FB_APP_ID_HERE'
72+
upsert_string app/src/variant/res/values/strings.xml "fb_login_protocol_scheme" 'FB_LOGIN_PROTOCOL_SCHEME_HERE'
73+
upsert_string app/src/variant/res/values/strings.xml "facebook_client_token" 'FB_CLIENT_TOKEN_HERE'
74+
75+
# Line resources
76+
upsert_string app/src/main/res/values/strings.xml "line_channel_id" 'LINE_CHANNEL_ID_HERE'
77+
upsert_string app/src/variant/res/values/strings.xml "line_channel_id" 'LINE_CHANNEL_ID_HERE'
78+
79+
# WeChat resources
80+
upsert_string app/src/main/res/values/strings.xml "wechat_app_id" 'WECHAT_APP_ID_HERE'
81+
upsert_string app/src/variant/res/values/strings.xml "wechat_app_id" 'WECHAT_APP_ID_HERE'
8682
8783
- name: Create file for google-services.json (Demo)
8884
run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > app/google-services.json

‎.github/workflows/bits&bytes_develop_tfa_push_debug.yml‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717

1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
with:
2222
ref: ${{ github.event.inputs.branch }}
2323

2424
- name: Set up JDK 17
25-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2626
with:
2727
distribution: 'zulu'
2828
java-version: '17'
@@ -31,12 +31,7 @@ jobs:
3131
run: |
3232
sed -i '/signingConfigs {/,/}/c\signingConfigs {\n\n getByName("debug") {\n keyAlias = "${{ secrets.BITS_N_BYTES_DEBUG_KEY_ALIAS }}"\n keyPassword = "${{ secrets.BITS_N_BYTES_DEBUG_KEY_PASSWORD }}"\n storeFile = file("keystore/debug")\n storePassword = "${{ secrets.BITS_N_BYTES_DEBUG_STORE_PASSWORD }}"\n }\n' app/build.gradle.kts
3333
34-
- name: Add API key/domain tags to strings.xml resource (demo only)
35-
run: |
36-
sed -i '/<\/resources>/i \ <string name="com.sap.cxcdc.apikey">${{ secrets.BITS_N_BYTES_DEMO_API_KEY_PUSH_TFA }}</string>' app/src/main/res/values/strings.xml
37-
sed -i '/<\/resources>/i \ <string name="com.sap.cxcdc.domain">us1.gigya.com</string>' app/src/main/res/values/strings.xml
38-
39-
- name: Helper to upsert a <string> in strings.xml
34+
- name: Configure string resources using helper
4035
shell: bash
4136
run: |
4237
upsert_string () {
@@ -52,29 +47,30 @@ jobs:
5247
' "$file" > "$file.tmp" && mv "$file.tmp" "$file"
5348
}
5449
50+
# API key/domain for demo only (Push TFA)
51+
upsert_string app/src/main/res/values/strings.xml "com.sap.cxcdc.apikey" '${{ secrets.BITS_N_BYTES_DEMO_API_KEY_PUSH_TFA }}'
52+
upsert_string app/src/main/res/values/strings.xml "com.sap.cxcdc.domain" 'us1.gigya.com'
53+
54+
# Asset statements
5555
upsert_string app/src/main/res/values/strings.xml "asset_statements" '${{ secrets.BITS_N_BYTES_ASSET_STATEMENTS }}'
5656
upsert_string app/src/variant/res/values/strings.xml "asset_statements" '${{ secrets.BITS_N_BYTES_ASSET_STATEMENTS }}'
5757
58-
- name: Add Google required resources to strings.xml resource (actual value for demo only)
59-
run: |
60-
sed -i '/<\/resources>/i \ <string name="google_server_client_id">${{ secrets.GOOGLE_WEB_SERVER_CLIENT_ID }}</string>' app/src/main/res/values/strings.xml
58+
# Google resources
59+
upsert_string app/src/main/res/values/strings.xml "google_server_client_id" '${{ secrets.GOOGLE_WEB_SERVER_CLIENT_ID }}'
6160
62-
- name: Add Facebook required resources to strings.xml resource (actual value for demo only)
63-
run: |
64-
sed -i '/<\/resources>/i \ <string name="facebook_app_id">FB_APP_ID_HERE</string>' app/src/main/res/values/strings.xml
65-
sed -i '/<\/resources>/i \ <string name="fb_login_protocol_scheme">FB_LOGIN_PROTOCOL_SCHEME_HERE</string>' app/src/main/res/values/strings.xml
66-
sed -i '/<\/resources>/i \ <string name="facebook_client_token">FB_CLIENT_TOKEN_HERE</string>' app/src/main/res/values/strings.xml
67-
sed -i '/<\/resources>/i \ <string name="facebook_app_id">FB_APP_ID_HERE</string>' app/src/variant/res/values/strings.xml
68-
sed -i '/<\/resources>/i \ <string name="fb_login_protocol_scheme">FB_LOGIN_PROTOCOL_SCHEME_HERE</string>' app/src/variant/res/values/strings.xml
69-
sed -i '/<\/resources>/i \ <string name="facebook_client_token">FB_CLIENT_TOKEN_HERE</string>' app/src/variant/res/values/strings.xml
70-
71-
- name: Add Line required resources to strings.xml resource (actual value for demo only)
72-
run: |
73-
sed -i '/<\/resources>/i \ <string name="line_channel_id">LINE_CHANNEL_ID_HERE</string>' app/src/main/res/values/strings.xml
61+
# Facebook resources (demo only)
62+
upsert_string app/src/main/res/values/strings.xml "facebook_app_id" 'FB_APP_ID_HERE'
63+
upsert_string app/src/main/res/values/strings.xml "fb_login_protocol_scheme" 'FB_LOGIN_PROTOCOL_SCHEME_HERE'
64+
upsert_string app/src/main/res/values/strings.xml "facebook_client_token" 'FB_CLIENT_TOKEN_HERE'
65+
upsert_string app/src/variant/res/values/strings.xml "facebook_app_id" 'FB_APP_ID_HERE'
66+
upsert_string app/src/variant/res/values/strings.xml "fb_login_protocol_scheme" 'FB_LOGIN_PROTOCOL_SCHEME_HERE'
67+
upsert_string app/src/variant/res/values/strings.xml "facebook_client_token" 'FB_CLIENT_TOKEN_HERE'
7468
75-
- name: Add WeChat required resources to strings.xml resource (actual value for demo only)
76-
run: |
77-
sed -i '/<\/resources>/i \ <string name="wechat_app_id">WECHAT_APP_ID_HERE</string>' app/src/main/res/values/strings.xml
69+
# Line resources (demo only)
70+
upsert_string app/src/main/res/values/strings.xml "line_channel_id" 'LINE_CHANNEL_ID_HERE'
71+
72+
# WeChat resources (demo only)
73+
upsert_string app/src/main/res/values/strings.xml "wechat_app_id" 'WECHAT_APP_ID_HERE'
7874
7975
- name: Create file for google-services.json (Demo)
8076
run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > app/google-services.json

0 commit comments

Comments
 (0)