Skip to content

Commit

Permalink
Merge branch 'fixup-detached-1.2.0' into release-1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jankapunkt committed Sep 3, 2024
2 parents 280acdd + 9873a40 commit e4ab680
Show file tree
Hide file tree
Showing 289 changed files with 7,102 additions and 1,140 deletions.
34 changes: 0 additions & 34 deletions .github/workflows/Audit.yml

This file was deleted.

66 changes: 66 additions & 0 deletions .github/workflows/app.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: App Testsuite

on:
push:
branches:
- main
pull_request:

jobs:
lint:
name: 'App Lint'
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'npm'
cache-dependency-path: 'package-lock.json'

- name: install node modules
run: cd app && npm i --legacy-peer-deps --force
- name: run standard js
run: cd app && npm run lint

tests:
name: 'App Unit Tests'
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'npm'
cache-dependency-path: 'package-lock.json'

- name: install node modules
run: cd app && npm ci --legacy-peer-deps --force

- name: run jest tests
run: cd app && npm test

docs:
name: 'Build App jsDoc'
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'npm'
cache-dependency-path: 'package-lock.json'

- name: install node modules
run: cd app && npm i --legacy-peer-deps --force
- name: run jsdoc
run: cd app && npm run docs
69 changes: 40 additions & 29 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,62 +3,56 @@ name: Backend Tests
on:
push:
branches:
- ma
- main
pull_request:

jobs:
lintcode:
name: Backend JS lint
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3

- name: setup node
uses: actions/setup-node@v3
with:
node-version: '14.x'
- name: checkout
uses: actions/checkout@v4

- name: cache dependencies
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: setup node
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'npm'
cache-dependency-path: 'package-lock.json'

- run: cd backend && npm install
- run: cd backend && npm run lint:code
- run: cd backend && npm install
- run: cd backend && npm run lint:code

tests:
name: Backend Meteor ${{ matrix.meteor }} tests
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Checkout leaonline:corelib repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: leaonline/corelib
path: github/corelib


- name: Checkout leaonline:service-registry repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: leaonline/service-registry
path: github/service-registry

# CACHING
- name: Install Meteor
id: cache-meteor-install
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.meteor
key: v2-meteor-${{ hashFiles('.meteor/versions') }}
key: v3-meteor-${{ hashFiles('.meteor/versions') }}
restore-keys: |
v2-meteor-
v3-meteor-
- name: Cache NPM dependencies
id: cache-meteor-npm
Expand All @@ -67,25 +61,25 @@ jobs:
path: ~/.npm
key: v1-npm-${{ hashFiles('package-lock.json') }}
restore-keys: |
v1-npm-
v1-npm-
- name: Cache Meteor build
id: cache-meteor-build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.meteor/local/resolver-result-cache.json
.meteor/local/plugin-cache
.meteor/local/isopacks
.meteor/local/bundler-cache/scanner
key: v2-meteor_build_cache-${{ github.ref }}-${{ github.sha }}
key: v3-meteor_build_cache-${{ github.ref }}-${{ github.sha }}
restore-key: |
v2-meteor_build_cache-
v3-meteor_build_cache-
- name: Setup meteor
uses: meteorengineer/setup-meteor@v1
with:
meteor-release: '2.7.3'
meteor-release: '3.0.2'

- name: Install NPM Dependencies
run: cd backend && meteor npm ci
Expand Down Expand Up @@ -119,4 +113,21 @@ jobs:
# uses: VeryGoodOpenSource/[email protected]
# with:
# path: ".coverage/lcov.info"
# min_coverage: 95 # TODO increase to 95!
# min_coverage: 95 # TODO increase to 95!

docs:
name: Backend Build Docs
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'npm'
cache-dependency-path: 'package-lock.json'

- run: cd backend && npm ci
- run: cd backend && npm run build:docs
33 changes: 0 additions & 33 deletions .github/workflows/jest_test.yml

This file was deleted.

31 changes: 0 additions & 31 deletions .github/workflows/jsdoc_test.yml

This file was deleted.

31 changes: 0 additions & 31 deletions .github/workflows/lint_test.yml

This file was deleted.

14 changes: 6 additions & 8 deletions app/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
// https://docs.expo.dev/guides/using-eslint/
module.exports = {
extends: ['expo', 'standard'],
plugins: ['jest'],
env: {
'jest/globals': true
},
rules: {
'react/display-name': 'off',
'react-hooks/exhaustive-deps': 'off',
'brace-style': [
'error',
'stroustrup',
{
allowSingleLine: true
}
],
'react/display-name': 'off',
'brace-style': ['error', 'stroustrup', { allowSingleLine: true }],
'import/no-duplicates': 0
}
}
4 changes: 4 additions & 0 deletions app/__mocks__/@react-native-async-storage/async-storage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// eslint-disable-next-line
const storageMock = require('@react-native-async-storage/async-storage/jest/async-storage-mock')

module.exports = storageMock
Loading

0 comments on commit e4ab680

Please sign in to comment.