Skip to content

Commit

Permalink
Merge pull request #278 from globe-and-citizen/develop
Browse files Browse the repository at this point in the history
Merge branch 'develop' into feature/permissioning-system
  • Loading branch information
hermannleboss authored Jul 27, 2024
2 parents 80a2150 + 9d220e2 commit f2a9f5b
Show file tree
Hide file tree
Showing 66 changed files with 1,869 additions and 1,527 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/app-vitest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ name: Frontend Vitest Unit Tests

on:
pull_request:
branches:
- master
- develop
branches: "*"
paths:
- "app/**"
workflow_dispatch:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/backend-vitest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ name: Backend Vitest Unit Tests

on:
pull_request:
branches:
- master
- develop
branches: "*"
paths:
- "backend/**"
workflow_dispatch:
Expand Down
58 changes: 28 additions & 30 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,37 @@
name: Code Quality check

on:
pull_request:
branches:
- master
- develop
paths:
- 'app/**'
workflow_dispatch:
pull_request:
branches: "*"
paths:
- "app/**"
workflow_dispatch:
jobs:
code_quality_check:
runs-on: ubuntu-latest
steps:
- name: 🛫 Checkout code
uses: actions/checkout@v4
code_quality_check:
runs-on: ubuntu-latest
steps:
- name: 🛫 Checkout code
uses: actions/checkout@v4

- name: 🏗 Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20.10.0
cache: 'npm'
cache-dependency-path: ./app/package-lock.json
- name: 🏗 Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20.10.0
cache: "npm"
cache-dependency-path: ./app/package-lock.json

- name: ⚙️ NPM install
run: npm ci
working-directory: ./app
- name: ⚙️ NPM install
run: npm ci
working-directory: ./app

- name: ⚙️ Run lint
run: npm run lint
working-directory: ./app
- name: ⚙️ Run lint
run: npm run lint
working-directory: ./app

- name: 🧹Format code
run: npm run format-check
working-directory: ./app
- name: 🧹Format code
run: npm run format-check
working-directory: ./app

- name: type check
run: npm run type-check
working-directory: ./app
- name: type check
run: npm run type-check
working-directory: ./app
4 changes: 1 addition & 3 deletions .github/workflows/contract-vitest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ name: Contract Vitest Unit Tests

on:
pull_request:
branches:
- master
- develop
branches: "*"
paths:
- "contract/**"
workflow_dispatch:
Expand Down
64 changes: 31 additions & 33 deletions .github/workflows/contract.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,41 @@
name: Contract CI/CD

on:
pull_request:
branches:
- master
- develop
paths:
- 'contract/**'
workflow_dispatch:
pull_request:
branches: "*"
paths:
- "contract/**"
workflow_dispatch:
jobs:
contract_ci_cd:
runs-on: ubuntu-latest
steps:
- name: 🛫 Checkout code
uses: actions/checkout@v4
contract_ci_cd:
runs-on: ubuntu-latest
steps:
- name: 🛫 Checkout code
uses: actions/checkout@v4

- name: 🏗 Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 18.14.0
cache: 'npm'
cache-dependency-path: ./contract/package-lock.json
- name: 🏗 Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 18.14.0
cache: "npm"
cache-dependency-path: ./contract/package-lock.json

- name: ⚙️ NPM install
run: npm install
working-directory: ./contract
- name: ⚙️ NPM install
run: npm install
working-directory: ./contract

- name: ⚒️ Run Compile
run: npm run compile
working-directory: ./contract
- name: ⚒️ Run Compile
run: npm run compile
working-directory: ./contract

- name: </> Run Format Check
run: npm run format-check
working-directory: ./contract
- name: </> Run Format Check
run: npm run format-check
working-directory: ./contract

- name: </> Run Linter
run: npm run lint
working-directory: ./contract
- name: </> Run Linter
run: npm run lint
working-directory: ./contract

- name: 🧪 Run Test
run: npm run test
working-directory: ./contract
- name: 🧪 Run Test
run: npm run test
working-directory: ./contract
Loading

0 comments on commit f2a9f5b

Please sign in to comment.