Skip to content

Commit

Permalink
Merge branch 'dev' into fix/outdated-cached-subject
Browse files Browse the repository at this point in the history
  • Loading branch information
ibrahimozkn committed Jul 24, 2024
2 parents 978807c + d0a1738 commit fd4f2e3
Show file tree
Hide file tree
Showing 19 changed files with 73 additions and 63 deletions.
2 changes: 1 addition & 1 deletion .fvmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"flutter": "3.22.3"
}
}
36 changes: 25 additions & 11 deletions .github/workflows/all_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ on:
- "core/**"
- "designer_v2/**"
- "flutter_common/**"
- '*.gitignore'
- 'melos.yaml'
- 'pubspec.yaml'
- 'pubspec.lock'
- ".github/workflows/all_packages.yml"
- ".github/workflows/init-workspace/**"
workflow_dispatch:
Expand All @@ -16,29 +20,39 @@ concurrency:
cancel-in-progress: true

jobs:
analyze:
static_analysis:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.READY_TO_MERGE_TOKEN }}

- name: Init workspace
uses: ./.github/workflows/init-workspace

- name: Run generate
run: melos run generate

- name: Run fix
run: melos run fix

- name: Run bootstrap
run: melos bootstrap

- name: Run format
run: melos format

- name: Run analyze
run: melos analyze

format:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Commit changes if any
uses: stefanzweifel/git-auto-commit-action@v5
with:
fetch-depth: 0
- name: Init workspace
uses: ./.github/workflows/init-workspace
- name: Run format
run: melos format --set-exit-if-changed
commit_message: 'chore: Apply static analysis changes'

test:
runs-on: ubuntu-latest
Expand Down
34 changes: 0 additions & 34 deletions .github/workflows/check-uncomitted-changes.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/deploy-apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:

app-store-release:
name: Create App Store Release
runs-on: macos-14 # macos-latest
runs-on: macos-latest
steps:
- name: Await potential publishing on Pub.dev
uses: johannesvedder/await-workflow@v1
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Linter

on:
push:

jobs:
linter:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.READY_TO_MERGE_TOKEN }}

- name: Check final newline
uses: johannesvedder/check-final-newline@main
with:
fail_on_missing_newline: 'false'

- name: Restore ignored files
run: |
git checkout -- **/l10n-missing.txt
- name: Commit changes if any
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: 'lint: Apply final newline changes'
6 changes: 3 additions & 3 deletions .github/workflows/ready_to_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ concurrency:
cancel-in-progress: true

jobs:
check_commit_status:
ready_to_merge:
runs-on: ubuntu-latest
steps:
- name: Check if PR is mergeable
- name: Check if PR is ready to merge
uses: actions/github-script@v7
with:
script: |
// Define a list of workflows that need to finish successfully if run before merging
workflows_to_check = [
"all_packages.yml",
"check-uncommitted-changes.yml",
"linter.yml",
"mega-linter.yml",
"e2e_tests.yml",
"supabase-test.yml",
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -163,4 +163,4 @@ generated/
megalinter-reports/

# FVM Version Cache
.fvm/
.fvm/
2 changes: 1 addition & 1 deletion .markdown_link_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"pattern": "localhost"
}
]
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ Henschel F, Manaswini M, Pottbäcker F, Edelman JA, Owoyele B, Danieletto M,
Golden E, Zweig M, Nadkarni G, Böttinger E (2020).
StudyU: a platform for designing and conducting innovative digital N-of-1
trials. arXiv: 2012.1420.
[https://arxiv.org/abs/2012.14201](https://arxiv.org/abs/2012.14201).
[https://arxiv.org/abs/2012.14201](https://arxiv.org/abs/2012.14201)
2 changes: 1 addition & 1 deletion app/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,4 @@ app.*.symbols
# snapshot generated screenshots
**/fastlane/screenshots
# scan temporary files
**/fastlane/test_output
**/fastlane/test_output
Original file line number Diff line number Diff line change
@@ -1 +1 @@
The StudyU Health app is part of the StudyU platform, together with the StudyU designer. With the StudyU designer, scientists are given a web application to digitally specify, publish, and conduct N-of-1 trials. The StudyU app is a smartphone application with innovative user-centric elements for participants to partake in the published trials and assess the effects of different interventions on their health. Thereby, the StudyU platform allows clinicians and researchers worldwide to easily design and conduct digital N-of-1 trials in a safe manner. StudyU has the potential to change the landscape of personalized treatments both for patients and healthy individuals, as a free collaborative tool for researchers, and as a tool that can be integrated in clinical practice.
The StudyU Health app is part of the StudyU platform, together with the StudyU designer. With the StudyU designer, scientists are given a web application to digitally specify, publish, and conduct N-of-1 trials. The StudyU app is a smartphone application with innovative user-centric elements for participants to partake in the published trials and assess the effects of different interventions on their health. Thereby, the StudyU platform allows clinicians and researchers worldwide to easily design and conduct digital N-of-1 trials in a safe manner. StudyU has the potential to change the landscape of personalized treatments both for patients and healthy individuals, as a free collaborative tool for researchers, and as a tool that can be integrated in clinical practice.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Find out the effects of different interventions on your health in a medial study
Find out the effects of different interventions on your health in a medial study
2 changes: 1 addition & 1 deletion app/android/fastlane/metadata/android/en-US/title.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
StudyU Health
StudyU Health
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

You can customize the launch screen with your own desired assets by replacing the image files in this directory.

You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@
"scale": "2x"
}
]
}
}
2 changes: 1 addition & 1 deletion app/web/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
"purpose": "maskable"
}
]
}
}
2 changes: 1 addition & 1 deletion database/migration/20230630_migrate-v2_6.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ ALTER TABLE public.app_config
ADD COLUMN analytics jsonb;

ALTER TABLE public.study
DROP COLUMN fhir_questionnaire;
DROP COLUMN fhir_questionnaire;
2 changes: 1 addition & 1 deletion database/migration/20231011_migrate_db.sql
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ CREATE OR REPLACE FUNCTION public.migrate_db(participant_user_id uuid, participa
AS $function$begin
UPDATE study_subject SET user_id = participant_user_id WHERE id = participant_subject_id;
end;$function$
;
;
2 changes: 1 addition & 1 deletion designer_v2/web/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
"purpose": "maskable"
}
]
}
}

0 comments on commit fd4f2e3

Please sign in to comment.