📁 Changed TDrive root folder (#16)

📁 Changed TDrive root folder
This commit is contained in:
Montassar Ghanmy
2023-04-11 10:04:29 +01:00
committed by GitHub
parent 3b3f67af07
commit e0615fa867
10548 changed files with 48 additions and 48 deletions
+7 -7
View File
@@ -4,7 +4,7 @@ on:
pull_request: pull_request:
branches: [main] branches: [main]
paths: paths:
- "twake/backend/node/**" - "tdrive/backend/node/**"
jobs: jobs:
lint: lint:
@@ -12,19 +12,19 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Prettier code style check - name: Prettier code style check
run: cd twake && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run lint:prettier run: cd tdrive && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run lint:prettier
- name: Lint - name: Lint
run: cd twake && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run lint run: cd tdrive && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run lint
test: test:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: build-test - name: build-test
run: cd twake && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run build run: cd tdrive && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run build
- name: unit-test - name: unit-test
run: cd twake && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run test:unit run: cd tdrive && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run test:unit
- name: e2e-mongo-test - name: e2e-mongo-test
run: cd twake && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=mongodb -e DB_DRIVER=mongodb -e PUBSUB_TYPE=local node npm run test:e2e run: cd tdrive && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=mongodb -e DB_DRIVER=mongodb -e PUBSUB_TYPE=local node npm run test:e2e
- name: e2e-cassandra-test - name: e2e-cassandra-test
run: cd twake && docker-compose -f docker-compose.tests.yml up -d scylladb elasticsearch rabbitmq && sleep 60 && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=elasticsearch -e DB_DRIVER=cassandra node npm run test:e2e run: cd tdrive && docker-compose -f docker-compose.tests.yml up -d scylladb elasticsearch rabbitmq && sleep 60 && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=elasticsearch -e DB_DRIVER=cassandra node npm run test:e2e
+7 -7
View File
@@ -5,7 +5,7 @@ on:
types: [assigned, opened, synchronize, reopened] types: [assigned, opened, synchronize, reopened]
branches: [main] branches: [main]
paths: paths:
- "twake/backend/node/**" - "tdrive/backend/node/**"
jobs: jobs:
test: test:
@@ -15,15 +15,15 @@ jobs:
with: with:
ref: "refs/pull/${{ github.event.number }}/merge" ref: "refs/pull/${{ github.event.number }}/merge"
- name: unit-test - name: unit-test
run: cd twake && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run test:unit run: cd tdrive && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run test:unit
- name: e2e-mongo-test - name: e2e-mongo-test
run: cd twake && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=mongodb -e DB_DRIVER=mongodb -e PUBSUB_TYPE=local node npm run test:e2e run: cd tdrive && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=mongodb -e DB_DRIVER=mongodb -e PUBSUB_TYPE=local node npm run test:e2e
- name: generate coverage summary json - name: generate coverage summary json
run: cd twake && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run test:merge:json run: cd tdrive && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run test:merge:json
- name: generate coverage summary text - name: generate coverage summary text
run: cd twake && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run test:merge:text run: cd tdrive && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run test:merge:text
- name: Jest Coverage Comment - name: Jest Coverage Comment
uses: MishaKav/jest-coverage-comment@main uses: MishaKav/jest-coverage-comment@main
with: with:
coverage-summary-path: twake/coverage/merged/coverage-summary.json coverage-summary-path: tdrive/coverage/merged/coverage-summary.json
coverage-path: twake/coverage/coverage-report.txt coverage-path: tdrive/coverage/coverage-report.txt
+3 -3
View File
@@ -4,17 +4,17 @@ on:
pull_request: pull_request:
branches: [main] branches: [main]
paths: paths:
- "twake/docker/**" - "tdrive/docker/**"
jobs: jobs:
build-frontend: build-frontend:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: cd twake && docker build -t tdrive/tdrive-frontend -f docker/tdrive-frontend/Dockerfile . - run: cd tdrive && docker build -t tdrive/tdrive-frontend -f docker/tdrive-frontend/Dockerfile .
build-node: build-node:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: cd twake && docker build --target production -t docker-registry.linagora.com/tdrive/tdrive-node -f docker/tdrive-node/Dockerfile . - run: cd tdrive && docker build --target production -t docker-registry.linagora.com/tdrive/tdrive-node -f docker/tdrive-node/Dockerfile .
+3 -3
View File
@@ -5,8 +5,8 @@ on:
push: push:
branches: [main] branches: [main]
paths: paths:
- "twake/docker/**" - "tdrive/docker/**"
- "twake/backend/**" - "tdrive/backend/**"
- ".github/workflows/**" - ".github/workflows/**"
jobs: jobs:
@@ -37,7 +37,7 @@ jobs:
name: tdrive/tdrive-node name: tdrive/tdrive-node
username: ${{ secrets.REGISTRY_USERNAME }} username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }} password: ${{ secrets.REGISTRY_PASSWORD }}
workdir: twake workdir: tdrive
registry: docker-registry.linagora.com registry: docker-registry.linagora.com
context: . context: .
target: production target: production
+10 -10
View File
@@ -6,13 +6,13 @@ on:
push: push:
branches: [main] branches: [main]
paths: paths:
- "twake/frontend/**" - "tdrive/frontend/**"
- "twake/docker/**" - "tdrive/docker/**"
- ".github/workflows/**" - ".github/workflows/**"
pull_request: pull_request:
branches: [main] branches: [main]
paths: paths:
- "twake/frontend/**" - "tdrive/frontend/**"
jobs: jobs:
build-frontend: build-frontend:
@@ -31,17 +31,17 @@ jobs:
with: with:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
- run: npm install -g yarn - run: npm install -g yarn
- run: cd twake/frontend/ && yarn install - run: cd tdrive/frontend/ && yarn install
- run: cp twake/frontend/src/app/environment/environment.ts.dist twake/frontend/src/app/environment/environment.ts - run: cp tdrive/frontend/src/app/environment/environment.ts.dist tdrive/frontend/src/app/environment/environment.ts
- if: ${{env.FRONTEND_ENV}} - if: ${{env.FRONTEND_ENV}}
run: echo ${{ secrets.FRONTEND_ENV }} > twake/frontend/src/app/environment/environment.ts run: echo ${{ secrets.FRONTEND_ENV }} > tdrive/frontend/src/app/environment/environment.ts
- run: cd twake/frontend/ && yarn test - run: cd tdrive/frontend/ && yarn test
- run: cd twake/frontend/ && yarn build - run: cd tdrive/frontend/ && yarn build
- name: Upload frontend build artifact - name: Upload frontend build artifact
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
with: with:
name: frontend-build name: frontend-build
path: twake/frontend/build/ path: tdrive/frontend/build/
publish-frontend: publish-frontend:
# needs: build-frontend # needs: build-frontend
@@ -69,6 +69,6 @@ jobs:
registry: docker-registry.linagora.com registry: docker-registry.linagora.com
username: ${{ secrets.REGISTRY_USERNAME }} username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }} password: ${{ secrets.REGISTRY_PASSWORD }}
workdir: twake workdir: tdrive
buildoptions: "-t docker-registry.linagora.com/tdrive/tdrive-frontend -f docker/tdrive-frontend/Dockerfile" buildoptions: "-t docker-registry.linagora.com/tdrive/tdrive-frontend -f docker/tdrive-frontend/Dockerfile"
tags: "${{ env.DOCKERTAG }},${{ env.DOCKERTAGVERSION }}" tags: "${{ env.DOCKERTAG }},${{ env.DOCKERTAGVERSION }}"
+4 -4
View File
@@ -121,11 +121,11 @@ docker-compose.yml
### Dev ### ### Dev ###
/docker-data/* /docker-data/*
/docker/data/* /docker/data/*
/twake/docker-data/* /tdrive/docker-data/*
/twake/docker-data /tdrive/docker-data
/twake/backend/websockets_server/false /tdrive/backend/websockets_server/false
### Twake specific ### ### Tdrive specific ###
/build/ /build/
/vendor/ /vendor/
/app/Ressources/DatabaseEncryption/.HaliteEncryptor.key /app/Ressources/DatabaseEncryption/.HaliteEncryptor.key
+14 -14
View File
@@ -7,7 +7,7 @@
"request": "launch", "request": "launch",
"type": "chrome", "type": "chrome",
"url": "http://localhost:3000", "url": "http://localhost:3000",
"webRoot": "${workspaceFolder}/twake/frontend/src" "webRoot": "${workspaceFolder}/tdrive/frontend/src"
}, },
{ {
"name": "Launch & Debug on Canay", "name": "Launch & Debug on Canay",
@@ -15,7 +15,7 @@
"request": "launch", "request": "launch",
"type": "chrome", "type": "chrome",
"url": "http://localhost:3000", "url": "http://localhost:3000",
"webRoot": "${workspaceFolder}/twake/frontend/src", "webRoot": "${workspaceFolder}/tdrive/frontend/src",
"runtimeExecutable": "canary" "runtimeExecutable": "canary"
}, },
{ {
@@ -24,12 +24,12 @@
"request": "launch", "request": "launch",
"reAttach": true, "reAttach": true,
"url": "http://localhost:3000", "url": "http://localhost:3000",
"webRoot": "${workspaceFolder}/twake/frontend/src", "webRoot": "${workspaceFolder}/tdrive/frontend/src",
}, },
{ {
"name": "Debug Node Backend", "name": "Debug Node Backend",
"request": "launch", "request": "launch",
"cwd": "${workspaceFolder}/twake/backend/node/", "cwd": "${workspaceFolder}/tdrive/backend/node/",
"runtimeArgs": [ "runtimeArgs": [
"run", "run",
"dev:debug" "dev:debug"
@@ -49,23 +49,23 @@
"protocol": "inspector", "protocol": "inspector",
"request": "attach", "request": "attach",
"type": "node", "type": "node",
"localRoot": "${workspaceFolder}/twake/backend/node/dist", "localRoot": "${workspaceFolder}/tdrive/backend/node/dist",
"remoteRoot": "/usr/src/app/dist", "remoteRoot": "/usr/src/app/dist",
"outFiles": [ "outFiles": [
"${workspaceFolder}/twake/backend/node/dist/**/**.js" "${workspaceFolder}/tdrive/backend/node/dist/**/**.js"
], ],
"skipFiles": [ "skipFiles": [
"<node_internals>/**/*.js" "<node_internals>/**/*.js"
], ],
"sourceMapPathOverrides": { "sourceMapPathOverrides": {
"file:///usr/src/app/node_modules/*": "${workspaceRoot}/twake/backend/node/node_modules/*", "file:///usr/src/app/node_modules/*": "${workspaceRoot}/tdrive/backend/node/node_modules/*",
"file:///usr/src/app/node_modules/": "${workspaceRoot}/twake/backend/node/node_modules/", "file:///usr/src/app/node_modules/": "${workspaceRoot}/tdrive/backend/node/node_modules/",
"file:///usr/src/app/*": "${workspaceRoot}/twake/backend/node/dist/*", "file:///usr/src/app/*": "${workspaceRoot}/tdrive/backend/node/dist/*",
"file:///usr/src/app/": "${workspaceRoot}/twake/backend/node/dist/", "file:///usr/src/app/": "${workspaceRoot}/tdrive/backend/node/dist/",
"/usr/src/app/node_modules/*": "${workspaceRoot}/twake/backend/node/node_modules/*", "/usr/src/app/node_modules/*": "${workspaceRoot}/tdrive/backend/node/node_modules/*",
"/usr/src/app/node_modules/": "${workspaceRoot}/twake/backend/node/node_modules/", "/usr/src/app/node_modules/": "${workspaceRoot}/tdrive/backend/node/node_modules/",
"/usr/src/app/*": "${workspaceRoot}/twake/backend/node/dist/*", "/usr/src/app/*": "${workspaceRoot}/tdrive/backend/node/dist/*",
"/usr/src/app/": "${workspaceRoot}/twake/backend/node/dist/" "/usr/src/app/": "${workspaceRoot}/tdrive/backend/node/dist/"
}, },
"sourceMaps": true "sourceMaps": true
} }

Some files were not shown because too many files have changed in this diff Show More