Skip to content

Commit

Permalink
Merge branch 'dev' into nova (and run prettier format)
Browse files Browse the repository at this point in the history
 Conflicts:
	.github/workflows/nova-build-temp.yaml
	.gitignore
	api/src/initServices.ts
	api/src/models/db/protocolVersion.ts
	api/src/routes.ts
	api/src/routes/node/info.ts
	client/package-lock.json
	client/package.json
	client/src/app/App.tsx
	client/src/app/AppUtils.tsx
	client/src/app/components/NetworkSwitcher.tsx
	client/src/app/routes.tsx
	client/src/app/routes/stardust/Visualizer.scss
	client/src/index.tsx
	client/src/models/config/protocolVersion.ts
	package.json
  • Loading branch information
msarcev committed Jan 15, 2024
2 parents 004e059 + a3ed15c commit a0ff1c8
Show file tree
Hide file tree
Showing 638 changed files with 19,111 additions and 18,807 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/nova-build-temp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ on:
workflow_dispatch:
inputs:
TARGET_COMMIT:
description: 'Target Commit Hash for the SDK'
description: "Target Commit Hash for the SDK"
required: false
default: '05b7cec884177ba11c8848d0d52c850a8bb496fe'
default: "05b7cec884177ba11c8848d0d52c850a8bb496fe"
environment:
type: choice
description: 'Select the environment to deploy to'
description: "Select the environment to deploy to"
options:
- nova
required: false
default: nova
deployment:
type: boolean
description: 'Deploy after build?'
description: "Deploy after build?"
required: false
default: false

Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: '16'
node-version: "16"

- name: Install System Dependencies
run: |
Expand Down Expand Up @@ -125,5 +125,4 @@ jobs:
- name: Deploy to Server
if: ${{ github.event.inputs.deployment }}
run: |
ssh -o StrictHostKeyChecking=no updater@${{ secrets.EXPLORER_NOVA_GATEWAY }} "${{ env.DEPLOY_ENV }} ${{ env.VERSION }}"
ssh -o StrictHostKeyChecking=no updater@${{ secrets.EXPLORER_NOVA_GATEWAY }} "${{ env.DEPLOY_ENV }} ${{ env.VERSION }}"
33 changes: 33 additions & 0 deletions .github/workflows/pr-lint-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Format & Lint Check

on:
pull_request:
types: [opened, reopened, synchronize]

jobs:
lint-check:
strategy:
fail-fast: false
matrix:
project: [api, client]
runs-on: ubuntu-latest
defaults:
run:
working-directory: ${{ matrix.project }}
steps:
- uses: actions/checkout@v2

- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: "16"

- name: Install Dependencies
run: npm install

- name: Format Check
run: npm run format:check

- name: Lint Check
run: npm run lint:check

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ config.prod.json
env.js

iota-sdk

**/.eslintcache
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged --allow-empty
3 changes: 3 additions & 0 deletions api/.eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
.eslintrc.js
*.d.ts

dist/**
node_modules/**
Loading

0 comments on commit a0ff1c8

Please sign in to comment.