Skip to content

Commit 6ceb0cf

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents 8f091d1 + 1f08ec6 commit 6ceb0cf

23 files changed

+7219
-13355
lines changed

.all-contributorsrc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,17 @@
4343
"code",
4444
"maintenance"
4545
]
46+
},
47+
{
48+
"login": "mend-bolt-for-github[bot]",
49+
"name": "mend-bolt-for-github[bot]",
50+
"avatar_url": "https://avatars.githubusercontent.com/in/16809?v=4",
51+
"profile": "https://github.com/apps/mend-bolt-for-github",
52+
"contributions": [
53+
"bug",
54+
"code",
55+
"maintenance"
56+
]
4657
}
4758
]
4859
}

.env.example

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
STACK=phpfpm
22
FOLDERPHAR=apps
3-
FILESQL=database_init/01_phpfpm.sql
4-
FOLDERLAMPY=lampy
5-
DOCKERCOMPOSEFILES=docker-compose.yml docker-compose-lampy.yml
3+
FOLDERSQL=database_init
4+
FILESQL=01_phpfpm.sql
5+
FOLDERLAMPY=./lampy
6+
SERVERNAME=phpfpm.traefik.me
7+
DOCKERCOMPOSEFILE=docker-compose-lampy.yml

.github/workflows/ci.yml

Lines changed: 138 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,148 @@
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: 'SET BDD'
27-
run: npm run bdd:mariadb
28-
- name: 'Launch Lampy'
29-
run: cd lampy && npm run exec
30-
- name: 'Image pull'
31-
run: npm run docker:getpull-image
32-
- name: 'Build containers'
33-
run: npm run docker:deploy
34-
- name: 'Waiting'
35-
run: npm run docker:waiting
36-
- name: linter readme.md
37-
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+
task phpfpm:copysql
107+
cd lampy && task lampy:exec
108+
109+
- name: Deploy containers
110+
run: |
111+
task phpfpm:getpull-image
112+
task phpfpm:getapacheconf
113+
task phpfpm:install-first
114+
task phpfpm:deploy
115+
task phpfpm:waiting
116+
117+
- name: Run Cypress tests
118+
uses: cypress-io/github-action@v6
119+
continue-on-error: true
120+
with:
121+
wait-on-timeout: 120
122+
browser: chrome
123+
record: false
124+
parallel: false
125+
config: screenshotOnRunFailure=true,video=true,videoCompression=32,defaultCommandTimeout=10000,requestTimeout=10000,responseTimeout=10000,retries={"runMode":2,"openMode":0}
126+
env:
127+
CYPRESS_CACHE_FOLDER: ~/.cache/Cypress
128+
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
129+
130+
- name: Docker stack stop
131+
if: always()
132+
run: |
133+
docker stack rm phpfpm
134+
docker stack rm lampy
135+
136+
# === ARTIFACTS PHASE ===
137+
- name: Archive test results
138+
uses: actions/upload-artifact@v4
139+
if: always()
140+
with:
141+
name: "test-results-${{ github.run_number }}-${{ github.sha }}"
142+
path: |
143+
cypress/screenshots
144+
cypress/videos
145+
cypress/reports
146+
retention-days: 7
147+
if-no-files-found: ignore
148+
compression-level: 6

.gitignore

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
2-
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
3-
# composer.lock
4-
node_modules
5-
apps/node_modules/
6-
apps/vendor
7-
apps/bin
1+
/node_modules
2+
/apps
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 = [email protected]: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: 8 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/phpfpm/graphs/commit-activity)
6-
![Continuous Integration](https://github.com/hackariens/phpfpm/workflows/ci/badge.svg?branch=develop)
6+
![Continuous Integration](https://github.com/hackariens/phpfpm/actions/workflows/ci.yml/badge.svg?branch=develop)
77

88
> Templates pour la création d'un nouveau projet phpfpm
99
1010
## 🏠 [Homepage](https://github.com/hackariens/phpfpm#readme)
1111

1212
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
13-
![All Contributors](https://img.shields.io/badge/all_contributors-3-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 [email protected]:hackariens/phpfpm.git phpfpm
35+
git clone --recursive [email protected]:hackariens/phpfpm.git phpfpm
3636
cd phpfpm
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 phpfpm:exec
5347
```
5448

5549
## Author
@@ -94,6 +88,7 @@ Thanks goes to these wonderful people
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://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>
9690
<td align="center" valign="top" width="14.28%"><a href="https://github.com/apps/dependabot"><img src="https://avatars.githubusercontent.com/in/29110?v=4" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a></td>
91+
<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>
9792
</tr>
9893
</tbody>
9994
</table>

0 commit comments

Comments
 (0)