Skip to content

Commit

Permalink
Revert "Update nara from master (#300)" (#306)
Browse files Browse the repository at this point in the history
This reverts commit 887427c.
  • Loading branch information
zeeshanakram3 authored Feb 27, 2024
1 parent 887427c commit a597dbd
Show file tree
Hide file tree
Showing 193 changed files with 39,950 additions and 115,988 deletions.
5 changes: 1 addition & 4 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ DB_PASS=squid
DB_ADMIN_USER=admin
DB_ADMIN_PASS=admin
DB_PORT=23798
# Processor service host
PROCESSOR_HOST=localhost

# Processor service prometheus port
PROCESSOR_PROMETHEUS_PORT=3337
# Graphql server port
Expand Down Expand Up @@ -64,8 +63,6 @@ [email protected]

# Debug settings
SQD_DEBUG=api:*

# playground
OPENAPI_PLAYGROUND=true

# max number of attempts to deliver email notification
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,3 @@ jobs:
node-version: ${{matrix.node-version}}
- name: Build docker image
run: make build-docker

migrations:
name: Run migrations
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js 16.x
uses: actions/setup-node@v1
with:
node-version: 16.x
- name: Prepare workspace
run: make prepare
- name: create joystream_default network
run: docker network create joystream_default
- name: Start db
run: docker-compose up -d orion_db
- name: Wait for db
run: |
while ! docker-compose exec -T orion_db pg_isready -U postgres -p 23798; do
sleep 1
done
- name: Run migrations
run: make migrate
6 changes: 0 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ src/auth-server/emails/templates/preview
/scripts/orion-v1-migration/data
/db/export
/db/migrations_dir*
.DS_STORE

# network tests
network-tests/graphql/generated
network-tests/node_modules
network-tests/lib

# LOGS
chron_mail_scheduler.log
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
}
}
16 changes: 16 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "lint",
"problemMatcher": [],
"label": "npm: lint",
"detail": "eslint --ext .ts ./src",
"group": {
"kind": "test",
"isDefault": true
}
}
]
}
Binary file removed .yarn/install-state.gz
Binary file not shown.
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ process: migrate

install:
@rm -rf node_modules # clean up node_modules to avoid issues with patch-package
@rm -rf network-tests/node_modules # clean up node_modules to avoid issues with patch-package
@npm install

build:
Expand Down Expand Up @@ -49,8 +48,6 @@ codegen:
@npm run generate:schema || true
@npx squid-typeorm-codegen

network-tests:
@npm run generate:network-tests || true

typegen:
@npx squid-substrate-typegen typegen.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@

const { getViewDefinitions } = require('../viewDefinitions')

module.exports = class Views1709038872576 {
name = 'Views1709038872576'
module.exports = class Views1708791754135 {
name = 'Views1708791754135'

async up(db) {
const viewDefinitions = getViewDefinitions(db);
Expand Down
145 changes: 0 additions & 145 deletions db/migrations/1709038872405-Data.js

This file was deleted.

3 changes: 1 addition & 2 deletions docker.env
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

# Docker db config
DB_HOST=orion_db
# DB connection
# Processor service host
PROCESSOR_HOST=orion_processor
# Archive gateway host&port (can be overriden via local env)
ARCHIVE_GATEWAY_URL=${CUSTOM_ARCHIVE_GATEWAY_URL:-http://orion_archive_gateway:8000/graphql}
ARCHIVE_GATEWAY_URL=${CUSTOM_ARCHIVE_GATEWAY_URL:-http://orion_archive_gateway:8000/graphql}
246 changes: 0 additions & 246 deletions docs/developer-guide.md

This file was deleted.

7 changes: 3 additions & 4 deletions joystream.jsonl

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions network-tests/.env

This file was deleted.

Empty file removed network-tests/.prettierignore
Empty file.
Loading

0 comments on commit a597dbd

Please sign in to comment.