Skip to content

Commit

Permalink
Merge branch 'main' into generateMetricsReport
Browse files Browse the repository at this point in the history
  • Loading branch information
EvanHahn committed Apr 23, 2024
2 parents 1b07286 + cdf151a commit dd48f8a
Show file tree
Hide file tree
Showing 24 changed files with 1,273 additions and 656 deletions.
69 changes: 69 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: CI

on:
push:
branches: [main]
pull_request:
# By default, a workflow only runs when a pull_request's activity type is
# opened, synchronize, or reopened. Adding ready_for_review here ensures
# that CI runs when a PR is marked as not a draft, since we skip CI when a
# PR is draft
types: [opened, synchronize, reopened, ready_for_review]

jobs:
all:
runs-on: ubuntu-latest
timeout-minutes: 10
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
- name: Install deps
run: npm ci
- name: Check formatting
run: npm run lint:prettier

backend:
runs-on: ubuntu-latest
timeout-minutes: 10
strategy:
fail-fast: false
defaults:
run:
working-directory: './src/backend'
steps:
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
- name: Install deps
run: |
npm ci --ignore-scripts
npm run postinstall
- name: Check types
run: npm run lint:types

frontend:
runs-on: ubuntu-latest
timeout-minutes: 10
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
- name: Install deps
run: npm ci
- name: Build translations
run: npm run build:translations
- name: Build Intl polyfills
run: npm run build:intl-polyfills
- name: Run unit tests
run: npm test
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@ The next version of Mapeo Mobile
npm install
```

2. (optional) Start the Metro bundler process
2. Start the Metro bundler process

```sh
npm start
```

Leave this running in a separate terminal window.

3. Build and run the app (Android)

- For this project, using a physical device is more convenient and reliable to work with. It is recommended that you follow React Native's [setup instructions](https://reactnative.dev/docs/running-on-device) for running an app on a device.
Expand Down
15 changes: 15 additions & 0 deletions messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,21 @@
"screens.Settings.CreateOrJoinProject.whatIsAProject": {
"message": "What is a Project"
},
"screens.Settings.YourTeam.InviteDeclined": {
"message": "Invitation Declined"
},
"screens.Settings.YourTeam.close": {
"message": "Close"
},
"screens.Settings.YourTeam.deviceHasJoined": {
"message": "Device Has Joined {projectName}"
},
"screens.Settings.YourTeam.inviteDeclinedDes": {
"message": "This device has declined your invitation. They have not joined the project."
},
"screens.Settings.YourTeam.unableToCancel": {
"message": "Unable to Cancel Invitation"
},
"screens.Settings.aboutMapeo": {
"description": "Primary text for 'About Mapeo' link (version info)",
"message": "About Mapeo"
Expand Down
Loading

0 comments on commit dd48f8a

Please sign in to comment.