Skip to content

Commit 67a4d90

Browse files
koromerzhinkoromerzhin
committed
Merge remote-tracking branch 'origin/develop'
2 parents d054ef8 + b7480ab commit 67a4d90

26 files changed

Lines changed: 10141 additions & 14592 deletions

‎.all-contributorsrc‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,28 @@
3232
"code",
3333
"maintenance"
3434
]
35+
},
36+
{
37+
"login": "mend-bolt-for-github[bot]",
38+
"name": "mend-bolt-for-github[bot]",
39+
"avatar_url": "https://avatars.githubusercontent.com/in/16809?v=4",
40+
"profile": "https://github.com/apps/mend-bolt-for-github",
41+
"contributions": [
42+
"bug",
43+
"code",
44+
"maintenance"
45+
]
46+
},
47+
{
48+
"login": "renovate[bot]",
49+
"name": "renovate[bot]",
50+
"avatar_url": "https://avatars.githubusercontent.com/in/2740?v=4",
51+
"profile": "https://github.com/apps/renovate",
52+
"contributions": [
53+
"bug",
54+
"code",
55+
"maintenance"
56+
]
3557
}
3658
]
3759
}

‎.env.example‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
STACK=socketio
1+
STACK=angular
22
FOLDERPHAR=apps
3-
FOLDERLAMPY=lampy
4-
DOCKERCOMPOSEFILES=docker-compose.yml docker-compose-lampy.yml
3+
DOCKERCOMPOSEFILE=docker-compose-lampy.yml

‎.github/workflows/ci.yml‎

Lines changed: 133 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,143 @@
1-
name: ci
2-
on: [push]
1+
name: CI/CD Pipeline
2+
on:
3+
push:
4+
branches: [main, develop]
5+
pull_request:
6+
branches: [main, develop]
7+
38
jobs:
4-
tests:
5-
runs-on: ${{ matrix.operating-system }}
6-
strategy:
7-
fail-fast: false
8-
matrix:
9-
operating-system: [ubuntu-20.04]
9+
lint:
10+
runs-on: ubuntu-24.04
11+
timeout-minutes: 60
12+
env:
13+
DOCKER_INTERACTIVE: false
1014
steps:
15+
# === SETUP PHASE ===
1116
- name: Checkout
12-
uses: actions/checkout@v3
17+
uses: actions/checkout@v5
1318
with:
1419
submodules: recursive
20+
21+
- name: Setup Docker Compose
22+
uses: docker/setup-compose-action@v1
23+
24+
- name: Setup Task
25+
uses: go-task/setup-task@v1
26+
27+
- name: Setup Node.js
28+
uses: actions/setup-node@v6
29+
with:
30+
node-version-file: '.nvmrc'
31+
cache: 'npm'
32+
cache-dependency-path: 'package-lock.json'
33+
34+
- name: Setup cache
35+
uses: actions/cache@v4
36+
with:
37+
path: node_modules
38+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
39+
restore-keys: ${{ runner.os }}-node-
40+
41+
- name: Install dependencies
42+
run: |
43+
if [ ! -d node_modules ]; then
44+
npm install
45+
fi
46+
47+
- name: Setup environment files
48+
run: |
49+
cp .env.example .env
50+
51+
- name: lint all
52+
run: task lint:all
53+
54+
launch:
55+
runs-on: ubuntu-24.04
56+
timeout-minutes: 60
57+
env:
58+
DOCKER_INTERACTIVE: false
59+
steps:
60+
# === SETUP PHASE ===
61+
- name: Checkout
62+
uses: actions/checkout@v5
63+
with:
64+
submodules: recursive
65+
66+
- name: Setup Docker Compose
67+
uses: docker/setup-compose-action@v1
68+
69+
- name: Setup Task
70+
uses: go-task/setup-task@v1
71+
72+
- name: Setup Node.js
73+
uses: actions/setup-node@v6
74+
with:
75+
node-version-file: '.nvmrc'
76+
cache: 'npm'
77+
cache-dependency-path: 'package-lock.json'
78+
1579
- name: Repository lampy
16-
uses: actions/checkout@v3
80+
uses: actions/checkout@v5
1781
with:
1882
submodules: recursive
19-
ref: 'v2.0'
2083
repository: koromerzhin/lampy
84+
ref: '4.3'
2185
path: lampy
22-
- name: Install npm dependencies
23-
run: npm install
24-
- name: 'set .env'
25-
run: 'cp .env.example .env'
26-
- name: 'Launch Lampy'
27-
run: cd lampy && npm run exec
28-
- name: 'Image pull'
29-
run: npm run docker:getpull-image
30-
- name: 'Build containers'
31-
run: npm run docker:deploy
32-
- name: 'Waiting'
33-
run: npm run docker:waiting
34-
- name: linter readme.md
35-
run: npm run lint:markdown
86+
87+
- name: Setup cache
88+
uses: actions/cache@v4
89+
with:
90+
path: node_modules
91+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
92+
restore-keys: ${{ runner.os }}-node-
93+
94+
- name: Install dependencies
95+
run: |
96+
if [ ! -d node_modules ]; then
97+
npm install
98+
fi
99+
100+
- name: Setup environment files
101+
run: |
102+
cp .env.example .env
103+
104+
- name: Setup database and infrastructure
105+
run: |
106+
cd lampy && task lampy:exec
107+
108+
- name: Deploy containers
109+
run: |
110+
task socketio:exec
111+
112+
- name: Run Cypress tests
113+
uses: cypress-io/github-action@v6
114+
continue-on-error: true
115+
with:
116+
wait-on-timeout: 120
117+
browser: chrome
118+
record: false
119+
parallel: false
120+
config: 'screenshotOnRunFailure=true,video=true,videoCompression=32,defaultCommandTimeout=10000,requestTimeout=10000,responseTimeout=10000,retries={"runMode":2,"openMode":0}'
121+
env:
122+
CYPRESS_CACHE_FOLDER: ~/.cache/Cypress
123+
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
124+
125+
- name: Docker stack stop
126+
if: always()
127+
run: |
128+
docker stack rm socketio
129+
docker stack rm lampy
130+
131+
# === ARTIFACTS PHASE ===
132+
- name: Archive test results
133+
uses: actions/upload-artifact@v4
134+
if: always()
135+
with:
136+
name: "test-results-${{ github.run_number }}-${{ github.sha }}"
137+
path: |
138+
cypress/screenshots
139+
cypress/videos
140+
cypress/reports
141+
retention-days: 7
142+
if-no-files-found: ignore
143+
compression-level: 6

‎.gitignore‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/node_modules
2-
/back/node_modules
3-
/front/node_modules
4-
app/node_modules
2+
/apps/node_modules
3+
.env
4+
docker-compose-*.yml
5+
!docker-compose-lampy.yml

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "taskfiles"]
2+
path = taskfiles
3+
url = git@github.com:koromerzhin/taskfiles.git

‎.nvmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v22

‎.release-it.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"git": {
3+
"requireBranch": "main",
4+
"commitMessage": "chore: release v${version}"
5+
},
6+
"$schema": "https://unpkg.com/release-it/schema/release-it.json",
7+
"github": {
8+
"release": true
9+
},
10+
"hooks": {
11+
"before:init": ["git pull", "task lint:all"],
12+
"after:bump": "npx auto-changelog -p"
13+
}
14+
}

‎.whitesource‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"scanSettings": {
3+
"baseBranches": []
4+
},
5+
"checkRunSettings": {
6+
"vulnerableCheckRunConclusionLevel": "failure",
7+
"displayMode": "diff",
8+
"useMendCheckNames": true
9+
},
10+
"issueSettings": {
11+
"minSeverityLevel": "LOW",
12+
"issueType": "DEPENDENCY"
13+
}
14+
}

‎README.md‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
![Version](https://img.shields.io/badge/version-1.0.0-blue.svg?cacheSeconds=2592000)
44
![Documentation](https://img.shields.io/badge/documentation-yes-brightgreen.svg)
55
[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/hackariens/socketio/graphs/commit-activity)
6-
![Continuous Integration](https://github.com/hackariens/socketio/workflows/ci/badge.svg?branch=develop)
6+
![Continuous Integration](https://github.com/hackariens/socketio/actions/workflows/ci.yml/badge.svg?branch=develop)
77

88
> Nouveau projet sous socket.io
99
1010
## 🏠 [Homepage](https://github.com/hackariens/socketio#readme)
1111

1212
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
13-
![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)
13+
![All Contributors](https://img.shields.io/badge/all_contributors-4-orange.svg?style=flat-square)
1414
<!-- ALL-CONTRIBUTORS-BADGE:END -->
1515

1616
## Need
1717

1818
Software:
1919

20-
- npm
21-
- docker
22-
- repository koromerzhin/lampy
20+
- [task](https://taskfile.dev/)
21+
- [nodejs](https://nodejs.org/)
22+
- [lampy](https://github.com/koromerzhin/lampy)
2323

2424
Config:
2525

@@ -32,24 +32,18 @@ Hosts:
3232
## Download
3333

3434
```sh
35-
git clone --recurse-submodules git@github.com:hackariens/socketio.git socketio
35+
git clone --recursive git@github.com:hackariens/socketio.git socketio
3636
cd socketio
3737
```
3838

3939
## Environnment
4040

4141
Edit .env with .env.example
4242

43-
## Install
44-
45-
```sh
46-
npm install
47-
```
48-
4943
## Launch
5044

5145
``` sh
52-
npm run exec
46+
task socketio:exec
5347
```
5448

5549
## Author
@@ -93,6 +87,8 @@ Thanks goes to these wonderful people
9387
<tr>
9488
<td align="center" valign="top" width="14.28%"><a href="https://github.com/koromerzhin"><img src="https://avatars0.githubusercontent.com/u/308012?v=4" width="100px;" alt=""/><br /><sub><b>Le TOULLEC Martial</b></sub></a></td>
9589
<td align="center" valign="top" width="14.28%"><a href="https://www.mend.io/free-developer-tools/renovate/"><img src="https://avatars.githubusercontent.com/u/25180681?v=4" width="100px;" alt=""/><br /><sub><b>Mend Renovate</b></sub></a></td>
90+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/apps/mend-bolt-for-github"><img src="https://avatars.githubusercontent.com/in/16809?v=4" width="100px;" alt=""/><br /><sub><b>mend-bolt-for-github[bot]</b></sub></a></td>
91+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/apps/renovate"><img src="https://avatars.githubusercontent.com/in/2740?v=4" width="100px;" alt=""/><br /><sub><b>renovate[bot]</b></sub></a></td>
9692
</tr>
9793
</tbody>
9894
</table>

0 commit comments

Comments
 (0)