Skip to content

Commit

Permalink
Merge branch 'mosip:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
pmigueld committed Jan 26, 2024
2 parents 1a63bcb + 4bbe377 commit 56294da
Show file tree
Hide file tree
Showing 609 changed files with 75,228 additions and 45,287 deletions.
2 changes: 2 additions & 0 deletions .bundle/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BUNDLE_PATH: "vendor/bundle"
BUNDLE_FORCE_RUBY_PLATFORM: 1
20 changes: 18 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
MIMOTO_HOST=https://api.qa4.mosip.net/residentmobileapp
# after making changes to the env file, ensure to start the bundler (or the project) with a --reset-cache
# eg . npm build android:newlogic --reset-cache

#MIMOTO_HOST=http://mock.mimoto.newlogic.dev
GOOGLE_NEARBY_MESSAGES_API_KEY=
MIMOTO_HOST=https://api.qa-inji.mosip.net

ESIGNET_HOST=https://api.qa-inji.mosip.net

OBSRV_HOST = https://dataset-api.obsrv.mosip.net

#Application Theme can be ( orange | purple )
APPLICATION_THEME=orange

#environment can be changed if it is toggled
CREDENTIAL_REGISTRY_EDIT=true
DEBUG_MODE=false

#supported languages( en, fil, ar, hi, kn, ta)
APPLICATION_LANGUAGE=en
4 changes: 4 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
root: true,
extends: '@react-native',
};
29 changes: 22 additions & 7 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---

name: Bug report
about: Create a report to help us improve
title: ''
labels: bug, triage
assignees:
assignees:
---

**Describe the bug**
A clear and concise description of what the bug is.
Expand All @@ -20,18 +20,33 @@ Steps to reproduce the behavior:
**Expected behavior**
A clear and concise description of what you expected to happen.

**Actual behavior**
A clear and concise description of what factually occurred.

**Screenshots**
If applicable, add screenshots to help explain your problem.
If applicable, add screenshots to help explain your problem.

**Add the screenshot of the profile page with commit id**

**Smartphone (please complete the following information):**

- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Wallet Device: [e.g. iPhone6]
- Phone make/model: [e.g. :Vivo Y73]
- OS: [e.g. iOS8.1]
- BLE version : [e.g. 4.2]

- Verifier Device: [e.g. iPhone6]
- Phone make/model: [e.g. :Vivo Y73]
- OS: [e.g. iOS8.1]
- BLE version : [e.g. 4.2]

- Inji app version: [e.g 0.3.0]
- Mimoto version: [e.g 1.2.x]
- MOSIP Version: [e.g. 1.2.1]
- Mimoto server: [e.g. https://.....com]
- MOSIP server: [e.g. https://...mosip.com]

**Where does the issue occur: Wallet/Verifier?**

**Logs of wallet and verifier:**

**Additional context**
Add any other context about the problem here.
Binary file added .github/keys/mosipgpgkey_pub.gpg
Binary file not shown.
Binary file added .github/keys/mosipgpgkey_sec.gpg
Binary file not shown.
93 changes: 47 additions & 46 deletions .github/workflows/android-custom-build.yml
Original file line number Diff line number Diff line change
@@ -1,55 +1,56 @@
name: ID PASS - MOSIP Resident Application Custom build

env:
backendServiceDefaultUrl: https://api-internal.qa4.mosip.net/residentmobileapp
name: Android Custom Build
run-name: ${{ inputs.buildName }}

on:
workflow_dispatch:
inputs:
backendServiceUrl:
description: 'Backend service URL'
buildName:
description: 'Run name'
required: true
default: 'Edit this name'
type: string
mimotoBackendServiceUrl:
description: 'Mimoto backend service URL'
required: true
default: 'https://api.sandbox.mosip.net'
type: string
esignetBackendServiceUrl:
description: 'Esignet backend service URL'
required: true
default: 'https://api-internal.qa4.mosip.net/residentmobileapp'
default: 'https://api.sandbox.mosip.net'
type: string
allow_env_edit:
description: 'Edit ENV'
required: true
default: 'true'
type: choice
options:
- false
- true
theme:
description: 'Application Theme'
required: true
default: 'orange'
type: choice
options:
- orange
- purple

jobs:
build-android:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.1.0

# Cache stuff for faster build
- name: Cache local npm repository
uses: actions/cache@v3.0.11
with:
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
path: ~/.npm

- name: Cache local gradle repository
uses: actions/cache@v3.0.11
with:
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
path: |
~/.gradle/caches
~/.gradle/wrapper
- name: Install npm dependencies
run: |
npm install
- name: Create .env.local file
run: |
echo "${{ secrets.ENV_FILE }}" > .env.local > android/local.properties
- name: Build App Newlogic Release
run: |
cd android
if [ ! -z "$FIREBASE_SECRET" ] && [ -f app/google-services.json.gpg ];then rm -f app/google-services.json;gpg -o app/google-services.json --batch --passphrase="$FIREBASE_SECRET" -d app/google-services.json.gpg;fi
./gradlew :app:assembleNewlogicRelease
env:
MIMOTO_HOST: ${{ github.event.inputs.backendServiceUrl }}
FIREBASE_SECRET: ${{ secrets.FIREBASE_SECRET }}
- name: Upload Artifact
uses: actions/upload-artifact@v3.1.1
with:
name: apk-output
path: android/app/build/outputs/apk/newlogic/release/
retention-days: 10
uses: mosip/kattu/.github/workflows/android-build.yml@master
with:
NODE_VERSION: "16.x"
MIMOTO_HOST: ${{ inputs.mimotoBackendServiceUrl }}
ESIGNET_HOST: ${{ inputs.esignetBackendServiceUrl }}
APPLICATION_THEME: ${{ inputs.theme }}
ALLOW_ENV_EDIT: ${{ inputs.allow_env_edit }}
KEYSTORE_ALIAS: androidbuildkey
KEYSTORE_PASSWORD: 'password'
SERVICE_LOCATION: '.'
ANDROID_SERVICE_LOCATION: 'android'
BUILD_SCRIPT_LOCATION: 'scripts'
SCRIPT_NAME: './android-build.sh'
UPLOAD_TO_ACTIONS: 'true'
ANDROID_ARTIFACT_NAME: ${{ inputs.buildName }}
ANDROID_ARTIFACT_PATH: "android/app/build/outputs/apk/residentapp/release/Inji_universal.apk"
52 changes: 0 additions & 52 deletions .github/workflows/android.yml

This file was deleted.

12 changes: 5 additions & 7 deletions .github/workflows/clear_artifacts.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
name: 'Delete old artifacts'
name: "Delete old artifacts"
on:
workflow_dispatch:

jobs:
delete-artifacts:
runs-on: ubuntu-latest
steps:
- uses: kolpav/purge-artifacts-action@v1
with:
token: ${{ secrets.ACTION_PAT }}
expire-in: 2days # Setting this to 0 will delete all artifacts
uses: mosip/kattu/.github/workflows/clear-artifacts.yml@master
secrets:
ACCESS_TOKEN: ${{ secrets.ACTION_PAT }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
Loading

0 comments on commit 56294da

Please sign in to comment.