Skip to content

Commit 4858e09

Browse files
DylanDylannDylanDylann
committed
Merge branch 'main' into refactor-661
2 parents 49cbb33 + 251ab97 commit 4858e09

596 files changed

Lines changed: 17955 additions & 7023 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/androidBump.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
uses: Expensify/GitHub-Actions/setup-certificate-1p@main
2626
with:
2727
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
28+
SHOULD_LOAD_SSL_CERTIFICATES: 'false'
2829

2930
- name: Load files from 1Password
3031
working-directory: android/app

‎.github/workflows/buildAndroid.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ jobs:
100100
uses: Expensify/GitHub-Actions/setup-certificate-1p@main
101101
with:
102102
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
103+
SHOULD_LOAD_SSL_CERTIFICATES: 'false'
103104

104105
- name: Load files from 1Password
105106
working-directory: android/app

‎.github/workflows/cspell.yml‎

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 🧙 Check spell
1+
name: Spell check
22

33
on:
44
pull_request:
@@ -8,15 +8,48 @@ on:
88
jobs:
99
spellcheck:
1010
runs-on: ubuntu-latest
11-
name: 🔍 spellcheck
1211
steps:
1312
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
14-
- uses: streetsidesoftware/cspell-action@72ae91e90fa38f2335a60e233a847a6d00a9f221
13+
14+
- name: Setup Node
15+
uses: ./.github/actions/composite/setupNode
16+
17+
- name: Remove E/App version from package-lock.json
18+
shell: bash
19+
run: jq 'del(.version, .packages[""].version)' package-lock.json > normalized-package-lock.json
20+
21+
- name: Restore cspell cache
22+
# v4
23+
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57
24+
with:
25+
path: .cspellcache
26+
key: cspell-${{ runner.os }}-${{ hashFiles('cspell.json', 'normalized-package-lock.json') }}-${{ github.sha }}
27+
restore-keys: |
28+
cspell-${{ runner.os }}-${{ hashFiles('cspell.json', 'normalized-package-lock.json') }}-
29+
cspell-${{ runner.os }}-
30+
31+
- name: Get changed files
32+
id: changed-files
33+
env:
34+
GH_TOKEN: ${{ github.token }}
35+
run: |
36+
FILES=$(gh api repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files --jq '.[].filename' | tr '\n' ' ')
37+
echo "files=$FILES" >> "$GITHUB_OUTPUT"
38+
39+
- name: Filter out dot files
40+
id: filtered-files
41+
run: |
42+
FILES=$(echo "${{ steps.changed-files.outputs.files }}" | tr ' ' '\n' | grep -v '^\.' | xargs)
43+
echo "files=$FILES" >> "$GITHUB_OUTPUT"
44+
45+
- name: Spell check
46+
if: steps.filtered-files.outputs.files != ''
47+
run: npm run spell-changed -- ${{ steps.filtered-files.outputs.files }}
48+
49+
- name: Save cspell cache
50+
# v4
51+
uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57
52+
if: always()
1553
with:
16-
files: "**/*"
17-
root: "."
18-
config: "./cspell.json"
19-
inline: error
20-
strict: true
21-
use_cspell_files: false
22-
incremental_files_only: true
54+
path: .cspellcache
55+
key: cspell-${{ runner.os }}-${{ hashFiles('cspell.json', 'normalized-package-lock.json') }}-${{ github.sha }}

‎.github/workflows/deploy.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ jobs:
133133
uses: Expensify/GitHub-Actions/setup-certificate-1p@main
134134
with:
135135
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
136+
SHOULD_LOAD_SSL_CERTIFICATES: 'false'
136137

137138
- name: Load files from 1Password
138139
env:
@@ -413,6 +414,7 @@ jobs:
413414
uses: Expensify/GitHub-Actions/setup-certificate-1p@main
414415
with:
415416
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
417+
SHOULD_LOAD_SSL_CERTIFICATES: 'false'
416418

417419
- name: Load files from 1Password
418420
env:

‎.github/workflows/lint-changed.yml‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,28 @@ jobs:
5656
uses: ./.github/actions/composite/setupNode
5757
with:
5858
IS_DESKTOP_BUILD: true
59-
59+
60+
- name: Remove E/App version from package-lock.json
61+
shell: bash
62+
run: jq 'del(.version, .packages[""].version)' package-lock.json > normalized-package-lock.json
63+
64+
- name: Restore ESLint cache
65+
# v4
66+
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57
67+
with:
68+
path: node_modules/.cache/eslint-changed
69+
key: ${{ runner.os }}-eslint-changed-${{ hashFiles('eslint.changed.config.*', 'normalized-package-lock.json') }}-${{ github.sha }}
70+
restore-keys: |
71+
${{ runner.os }}-eslint-changed-${{ hashFiles('eslint.changed.config.*', 'normalized-package-lock.json') }}-
72+
${{ runner.os }}-eslint-changed-
73+
6074
- name: Run ESLint to check for deprecation warnings
61-
run: |
62-
# shellcheck disable=SC2046
63-
npm run lint-changed
75+
run: npm run lint-changed
76+
77+
- name: Save ESLint cache
78+
# v4
79+
uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57
80+
if: always()
81+
with:
82+
path: node_modules/.cache/eslint-changed
83+
key: ${{ runner.os }}-eslint-changed-${{ hashFiles('eslint.changed.config.*', 'normalized-package-lock.json') }}-${{ github.sha }}

‎.github/workflows/lint.yml‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,29 @@ jobs:
2626
with:
2727
IS_DESKTOP_BUILD: true
2828

29-
- name: Remove E/App version from package-lock.json (For cache invalidation)
29+
- name: Remove E/App version from package-lock.json
3030
shell: bash
31-
# Remove App version from package-lock.json to avoid cache invalidation when the App version changes
3231
run: jq 'del(.version, .packages[""].version)' package-lock.json > normalized-package-lock.json
3332

34-
- name: Cache ESLint
33+
- name: Restore ESLint cache
3534
# v4
36-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
35+
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57
3736
with:
3837
path: node_modules/.cache/eslint
39-
# Only invalidate the cache if the eslint ruleset change (from eslint.config.mjs or the normalized-package-lock.json), we use --cache-strategy content to handle cache invalidation
40-
# See https://eslint.org/docs/latest/use/command-line-interface#--cache-strategy for more information
41-
key: ${{ runner.os }}-eslint-${{ hashFiles('eslint.config.*', 'normalized-package-lock.json') }}
38+
key: ${{ runner.os }}-eslint-${{ hashFiles('eslint.config.*', 'normalized-package-lock.json') }}-${{ github.sha }}
4239
restore-keys: |
40+
${{ runner.os }}-eslint-${{ hashFiles('eslint.config.*', 'normalized-package-lock.json') }}-
4341
${{ runner.os }}-eslint-
4442
4543
- name: Lint JavaScript and Typescript with ESLint
4644
run: npm run lint
4745
env:
4846
CI: true
47+
48+
- name: Save ESLint cache
49+
# v4
50+
uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57
51+
if: always()
52+
with:
53+
path: node_modules/.cache/eslint
54+
key: ${{ runner.os }}-eslint-${{ hashFiles('eslint.config.*', 'normalized-package-lock.json') }}-${{ github.sha }}

‎.github/workflows/testBuild.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ jobs:
357357
uses: Expensify/GitHub-Actions/setup-certificate-1p@main
358358
with:
359359
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
360+
SHOULD_LOAD_SSL_CERTIFICATES: 'false'
360361

361362
- name: Load files from 1Password
362363
env:
@@ -488,6 +489,7 @@ jobs:
488489
uses: Expensify/GitHub-Actions/setup-certificate-1p@main
489490
with:
490491
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
492+
SHOULD_LOAD_SSL_CERTIFICATES: 'false'
491493

492494
- name: Load files from 1Password
493495
env:

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,6 @@ modules/*/lib/
157157

158158
# Claude local settings
159159
.claude/settings.local.json
160+
161+
# cspell cache
162+
.cspellcache

‎Mobile-Expensify‎

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009027900
118-
versionName "9.2.79-0"
117+
versionCode 1009028500
118+
versionName "9.2.85-0"
119119
// Supported language variants must be declared here to avoid from being removed during the compilation.
120120
// This also helps us to not include unnecessary language variants in the APK.
121121
resConfigs "en", "es"

0 commit comments

Comments
 (0)