Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/npm_and_yarn/VAMobile/detox-20…
Browse files Browse the repository at this point in the history
….28.0
  • Loading branch information
timwright12 authored Dec 3, 2024
2 parents b05450d + fc56bba commit 6801707
Show file tree
Hide file tree
Showing 51 changed files with 851 additions and 616 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/app_store_checks_apple.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# workflow to check that PR does not break any Apple App Store max file or max character limits
name: "App Store requirement checks"

on:
Expand All @@ -16,52 +17,52 @@ jobs:
with:
max_size: 10
working_dir: VAMobile/ios/fastlane/screenshots/en-US
file_counting_function: find . -maxdepth 1 -name "ipadPro2*" -printf '.' | wc -m
counting_function: find . -maxdepth 1 -name "ipadPro2*" -printf '.' | wc -m
check_ios_ipad_pro13_images:
uses: ./.github/workflows/check_max_size.yml
with:
max_size: 10
working_dir: VAMobile/ios/fastlane/screenshots/en-US
file_counting_function: find . -maxdepth 1 -name "ipadPro13*" -printf '.' | wc -m
counting_function: find . -maxdepth 1 -name "ipadPro13*" -printf '.' | wc -m
check_ios_ipad_pro129_images:
uses: ./.github/workflows/check_max_size.yml
with:
max_size: 10
working_dir: VAMobile/ios/fastlane/screenshots/en-US
file_counting_function: find . -maxdepth 1 -name "ipadPro12*" -printf '.' | wc -m
counting_function: find . -maxdepth 1 -name "ipadPro12*" -printf '.' | wc -m
check_ios_iphone55_images:
uses: ./.github/workflows/check_max_size.yml
with:
max_size: 10
working_dir: VAMobile/ios/fastlane/screenshots/en-US
file_counting_function: find . -maxdepth 1 -name "phone5*" -printf '.' | wc -m
counting_function: find . -maxdepth 1 -name "phone5*" -printf '.' | wc -m
check_ios_iphone67_images:
uses: ./.github/workflows/check_max_size.yml
with:
max_size: 10
working_dir: VAMobile/ios/fastlane/screenshots/en-US
file_counting_function: find . -maxdepth 1 -name "iphone6*" -printf '.' | wc -m
counting_function: find . -maxdepth 1 -name "iphone6*" -printf '.' | wc -m
check_ios_description:
uses: ./.github/workflows/check_max_size.yml
with:
max_size: 4000
working_dir: VAMobile/ios/fastlane/metadata/en-US
file_counting_function: wc -c description.txt | awk '{print $1}'
counting_function: wc -c description.txt | awk '{print $1}'
check_ios_release_notes:
uses: ./.github/workflows/check_max_size.yml
with:
max_size: 4000
working_dir: VAMobile/ios/fastlane/metadata/en-US
file_counting_function: wc -c release_notes.txt | awk '{print $1}'
counting_function: wc -c release_notes.txt | awk '{print $1}'
check_ios_keyword:
uses: ./.github/workflows/check_max_size.yml
with:
max_size: 1000
working_dir: VAMobile/ios/fastlane/metadata/en-US
file_counting_function: wc -c keywords.txt | awk '{print $1}'
counting_function: wc -c keywords.txt | awk '{print $1}'
check_ios_title:
uses: ./.github/workflows/check_max_size.yml
with:
max_size: 50
working_dir: VAMobile/ios/fastlane/metadata/en-US
file_counting_function: wc -c title.txt | awk '{print $1}'
counting_function: wc -c title.txt | awk '{print $1}'
13 changes: 7 additions & 6 deletions .github/workflows/app_store_checks_google.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# workflow to check that PR does not break any Googke Play Store max file or max character limits
name: "App Store requirement checks"

on:
Expand All @@ -15,34 +16,34 @@ jobs:
with:
max_size: 8
working_dir: VAMobile/android/fastlane/metadata/android/en-US/images/phoneScreenshots
file_counting_function: ls | wc -l
counting_function: ls | wc -l
check_max_android_seven_inch_screenshots:
uses: ./.github/workflows/check_max_size.yml
with:
max_size: 8
working_dir: VAMobile/android/fastlane/metadata/android/en-US/images/sevenInchScreenshots
file_counting_function: ls | wc -l
counting_function: ls | wc -l
check_android_long_description:
uses: ./.github/workflows/check_max_size.yml
with:
max_size: 4000
working_dir: VAMobile/android/fastlane/metadata/android/en-US
file_counting_function: wc -c full-description.txt | awk '{print $1}'
counting_function: wc -c full-description.txt | awk '{print $1}'
check_android_short_description:
uses: ./.github/workflows/check_max_size.yml
with:
max_size: 80
working_dir: VAMobile/android/fastlane/metadata/android/en-US
file_counting_function: wc -c short-description.txt | awk '{print $1}'
counting_function: wc -c short-description.txt | awk '{print $1}'
check_android_change_log:
uses: ./.github/workflows/check_max_size.yml
with:
max_size: 500
working_dir: VAMobile/android/fastlane/metadata/android/en-US/changelogs
file_counting_function: wc -c default.txt | awk '{print $1}'
counting_function: wc -c default.txt | awk '{print $1}'
check_android_release_name:
uses: ./.github/workflows/check_max_size.yml
with:
max_size: 50
working_dir: VAMobile/android/fastlane/metadata/android/en-US
file_counting_function: wc -c title.txt | awk '{print $1}'
counting_function: wc -c title.txt | awk '{print $1}'
4 changes: 2 additions & 2 deletions .github/workflows/check_max_size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
max_size:
required: true
type: string
file_counting_function:
counting_function:
required: true
type: string

Expand All @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- run: |
if [[ $(${{ inputs.file_counting_function }}) -gt ${{ inputs.max_size }} ]]
if [[ $(${{ inputs.counting_function }}) -gt ${{ inputs.max_size }} ]]
then
echo "PR exceeds app store limits of ${{ inputs.max_size }} for this check"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/native_build_check_android.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Tests to see that changes to native files do not break the Android build process
name: '[Code Quality] Check Native Android Builds'
name: '[Code Quality] Check Native Android Builds'

on:
pull_request:
Expand Down
27 changes: 24 additions & 3 deletions .github/workflows/start_slack_thread.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,31 @@ jobs:
- name: Search Slack for channel ID
id: search_slack
run: |
id=$(curl -X GET -H 'Authorization: Bearer '"$SLACK_API_TOKEN"' ' \
fetch_page() {
last_response=$(curl -X GET -H 'Authorization: Bearer '"$SLACK_API_TOKEN"' ' \
-H 'Content-type: application/x-www-form-urlencoded' \
https://slack.com/api/conversations.list\?limit=1000 |
jq '.channels[] | .name as $data | select($data == "${{inputs.channel_name}}").id' )
https://slack.com/api/conversations.list\?limit=1000\&cursor=$cursor | jq .)
}
get_id() {
id=$(jq '.channels[] | .name as $data | select($data == "${{inputs.channel_name}}").id' <<< $last_response)
}
get_cursor() {
cursor=$(jq '.response_metadata.next_cursor' <<< $last_response)
}
id=""
cursor=""
last_response=""
fetch_page
get_id
while [[ -z "$id" ]]
do
get_cursor
fetch_page
get_id
done
echo SLACK_CHANNEL_ID=${id} >> $GITHUB_OUTPUT
start_thread:
name: Start thread
Expand Down
6 changes: 3 additions & 3 deletions VAMobile/android/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ GEM
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.1010.0)
aws-sdk-core (3.213.0)
aws-partitions (1.1013.0)
aws-sdk-core (3.214.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.96.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.172.0)
aws-sdk-s3 (1.174.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
Expand Down
Loading

0 comments on commit 6801707

Please sign in to comment.