align for IA agents + grafana
This commit is contained in:
parent
be5b64475f
commit
0b2edeb94c
8
.gitmodules
vendored
8
.gitmodules
vendored
@ -30,10 +30,10 @@
|
|||||||
path = ihm_client
|
path = ihm_client
|
||||||
url = git@git.4nkweb.com:4nk/ihm_client.git
|
url = git@git.4nkweb.com:4nk/ihm_client.git
|
||||||
branch = ext
|
branch = ext
|
||||||
[submodule "lecoffre-back-mini"]
|
# [submodule "lecoffre-back-mini"]
|
||||||
path = lecoffre-back-mini
|
# path = lecoffre-back-mini
|
||||||
url = git@git.4nkweb.com:4nk/lecoffre-back-mini.git
|
# url = git@git.4nkweb.com:4nk/lecoffre-back-mini.git
|
||||||
branch = ext
|
# branch = ext
|
||||||
[submodule "lecoffre-front"]
|
[submodule "lecoffre-front"]
|
||||||
path = lecoffre-front
|
path = lecoffre-front
|
||||||
url = git@git.4nkweb.com:4nk/lecoffre-front.git
|
url = git@git.4nkweb.com:4nk/lecoffre-front.git
|
||||||
|
@ -26,7 +26,7 @@ Ce document explique comment déclencher les CI pour tous les projets du LeCoffr
|
|||||||
| `sdk_signer` | `.gitea/workflows/build-ext.yml` | `git.4nkweb.com/4nk/sdk_signer:ext` | ✅ CI configurée |
|
| `sdk_signer` | `.gitea/workflows/build-ext.yml` | `git.4nkweb.com/4nk/sdk_signer:ext` | ✅ CI configurée |
|
||||||
| `ihm_client` | `.gitea/workflows/docker-ext.yml` | `git.4nkweb.com/4nk/ihm_client:ext` | ✅ CI configurée |
|
| `ihm_client` | `.gitea/workflows/docker-ext.yml` | `git.4nkweb.com/4nk/ihm_client:ext` | ✅ CI configurée |
|
||||||
| `lecoffre-front` | `.gitea/workflows/build-ext.yml` | `git.4nkweb.com/4nk/lecoffre-front:ext` | ✅ CI configurée |
|
| `lecoffre-front` | `.gitea/workflows/build-ext.yml` | `git.4nkweb.com/4nk/lecoffre-front:ext` | ✅ CI configurée |
|
||||||
| `lecoffre-back-mini` | `.gitea/workflows/build-ext.yml` | `git.4nkweb.com/4nk/lecoffre-back-mini:ext` | ✅ CI configurée |
|
|
||||||
|
|
||||||
## 🚀 Commandes pour déclencher les CI
|
## 🚀 Commandes pour déclencher les CI
|
||||||
|
|
||||||
@ -90,20 +90,10 @@ git push origin refs/tags/ext
|
|||||||
- **Image Docker**: `git.4nkweb.com/4nk/lecoffre-front:ext`
|
- **Image Docker**: `git.4nkweb.com/4nk/lecoffre-front:ext`
|
||||||
- **Tags existants**: `ext`
|
- **Tags existants**: `ext`
|
||||||
|
|
||||||
#### 6. lecoffre-back-mini
|
|
||||||
```bash
|
|
||||||
cd /home/debian/4NK_env/lecoffre-back-mini
|
|
||||||
git tag -a ext -m "ci: docker_tag=ext - Trigger CI build for lecoffre-back-mini"
|
|
||||||
git push origin refs/tags/ext
|
|
||||||
```
|
|
||||||
- **Workflow**: `.gitea/workflows/build-ext.yml`
|
|
||||||
- **Image Docker**: `git.4nkweb.com/4nk/lecoffre-back-mini:ext`
|
|
||||||
- **Tags existants**: `ext`
|
|
||||||
|
|
||||||
### Pour tous les projets
|
### Pour tous les projets
|
||||||
```bash
|
```bash
|
||||||
cd /home/debian/4NK_env
|
cd /home/debian/4NK_env
|
||||||
for project in sdk_relay sdk_storage sdk_signer ihm_client lecoffre-front lecoffre-back-mini; do
|
for project in sdk_relay sdk_storage sdk_signer ihm_client lecoffre-front; do
|
||||||
echo "=== Déclenchement CI pour $project ==="
|
echo "=== Déclenchement CI pour $project ==="
|
||||||
cd $project
|
cd $project
|
||||||
git tag -a ext -m "ci: docker_tag=ext - Trigger CI build for $project"
|
git tag -a ext -m "ci: docker_tag=ext - Trigger CI build for $project"
|
||||||
@ -136,7 +126,7 @@ ci: docker_tag=ext - Add new features for relay service
|
|||||||
### Types de workflows
|
### Types de workflows
|
||||||
|
|
||||||
#### Workflow build-ext.yml (standard)
|
#### Workflow build-ext.yml (standard)
|
||||||
- **Projets**: sdk_relay, sdk_storage, sdk_signer, lecoffre-front, lecoffre-back-mini
|
- **Projets**: sdk_relay, sdk_storage, sdk_signer, lecoffre-front
|
||||||
- **Caractéristiques**:
|
- **Caractéristiques**:
|
||||||
- Utilise Docker BuildKit
|
- Utilise Docker BuildKit
|
||||||
- Support SSH pour les clonages Git
|
- Support SSH pour les clonages Git
|
||||||
@ -201,7 +191,6 @@ Les CI sont visibles sur `git.4nkweb.com` dans l'interface web de chaque projet.
|
|||||||
| sdk_signer | ext | ext | build-ext.yml | ✅ | ✅ Configuré |
|
| sdk_signer | ext | ext | build-ext.yml | ✅ | ✅ Configuré |
|
||||||
| ihm_client | ext | ext | docker-ext.yml | ✅ | ✅ Configuré |
|
| ihm_client | ext | ext | docker-ext.yml | ✅ | ✅ Configuré |
|
||||||
| lecoffre-front | ext | ext | build-ext.yml | ✅ | ✅ Configuré |
|
| lecoffre-front | ext | ext | build-ext.yml | ✅ | ✅ Configuré |
|
||||||
| lecoffre-back-mini | ext | ext | build-ext.yml | ✅ | ✅ Configuré |
|
|
||||||
|
|
||||||
## 🎯 Prochaines étapes
|
## 🎯 Prochaines étapes
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ Phase 2: Services Blockchain (Séquentiel)
|
|||||||
├── bitcoin → blindbit → sdk_relay
|
├── bitcoin → blindbit → sdk_relay
|
||||||
|
|
||||||
Phase 3: Services Applicatifs (Séquentiel)
|
Phase 3: Services Applicatifs (Séquentiel)
|
||||||
├── lecoffre-back → lecoffre-front, ihm_client
|
├── lecoffre-front, ihm_client
|
||||||
|
|
||||||
Phase 4: Services de Monitoring (Séquentiel, Indépendant)
|
Phase 4: Services de Monitoring (Séquentiel, Indépendant)
|
||||||
├── loki → promtail → grafana
|
├── loki → promtail → grafana
|
||||||
@ -141,7 +141,7 @@ Phase 5: Services Utilitaires
|
|||||||
|
|
||||||
### **Dépendances Critiques**
|
### **Dépendances Critiques**
|
||||||
1. **bitcoin** → **blindbit** → **sdk_relay** : Chaîne blockchain
|
1. **bitcoin** → **blindbit** → **sdk_relay** : Chaîne blockchain
|
||||||
2. **sdk_relay** → **lecoffre-back** → **lecoffre-front** : Chaîne applicative
|
2. **sdk_relay** → **lecoffre-front** : Chaîne applicative
|
||||||
3. **loki** → **promtail** → **grafana** : Chaîne monitoring
|
3. **loki** → **promtail** → **grafana** : Chaîne monitoring
|
||||||
|
|
||||||
### **Healthchecks**
|
### **Healthchecks**
|
||||||
|
@ -68,7 +68,7 @@ tor → bitcoin → blindbit → sdk_relay
|
|||||||
#### **Phase 3: Services Applicatifs (Séquentiel)**
|
#### **Phase 3: Services Applicatifs (Séquentiel)**
|
||||||
```bash
|
```bash
|
||||||
# Chaîne de dépendances applicatives
|
# Chaîne de dépendances applicatives
|
||||||
sdk_relay → lecoffre-back → lecoffre-front
|
sdk_relay → lecoffre-front
|
||||||
sdk_relay + sdk_storage → ihm_client
|
sdk_relay + sdk_storage → ihm_client
|
||||||
```
|
```
|
||||||
|
|
||||||
@ -192,7 +192,7 @@ docker logs bitcoin
|
|||||||
|
|
||||||
### **Dépendances Critiques**
|
### **Dépendances Critiques**
|
||||||
1. **bitcoin** → **blindbit** → **sdk_relay** : Chaîne blockchain
|
1. **bitcoin** → **blindbit** → **sdk_relay** : Chaîne blockchain
|
||||||
2. **sdk_relay** → **lecoffre-back** → **lecoffre-front** : Chaîne applicative
|
2. **sdk_relay** → **lecoffre-front** : Chaîne applicative
|
||||||
3. **loki** → **promtail** → **grafana** : Chaîne monitoring
|
3. **loki** → **promtail** → **grafana** : Chaîne monitoring
|
||||||
|
|
||||||
### **Healthchecks**
|
### **Healthchecks**
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
# Contexte
|
# Contexte
|
||||||
|
|
||||||
Le site est sur @https://dev4.4nkweb.com/lecoffre (`lecoffre_front`).
|
Le site est sur @https://dev4.4nkweb.com/lecoffre (`lecoffre_front`).
|
||||||
Il sera redirigé au login des notaires vers un site qui redirige vers @http://local.4nkweb.com:3000/ qui sera redirigé vers @https://dev4.4nkweb.com/lecoffre avec l'ouverture de l'iframe @https://dev4.4nkweb.com/ (`ihm_client`).
|
Il sera redirigé au login des notaires vers un site qui redirige vers @http://dev3.4nkweb.com/ qui sera redirigé vers @https://dev4.4nkweb.com/lecoffre avec l'ouverture de l'iframe @https://dev4.4nkweb.com/ (`ihm_client`).
|
||||||
|
|
||||||
Fonctionnellement, le test est sur navigateur de :
|
Fonctionnellement, le test est sur navigateur de :
|
||||||
* tenter un login () notaire dont la redirection IdNot (redirections et API notaires) et valider dans l'iframe et d'arriver connecté apres la vérification du compte Stripe (lecoffre-back-mini).
|
* tenter un login () notaire dont la redirection IdNot (redirections et API notaires) et valider dans l'iframe et d'arriver connecté apres la vérification du compte Stripe (lecoffre-back-mini sur dev3.4nkweb.com).
|
||||||
* créer un compte dossier en tant que notaire en ajoutant un client ce qui enverra un lien par mail par mailshimp puis en tant que client me connecté avec le lien recçu par mail, confirmer le code sms (api ovh) et accéder à mon dossier.
|
* créer un compte dossier en tant que notaire en ajoutant un client ce qui enverra un lien par mail par mailshimp puis en tant que client me connecté avec le lien recçu par mail, confirmer le code sms (api ovh) et accéder à mon dossier.
|
||||||
|
|
||||||
Tehcniquement, le test est sur navigateur de :
|
Tehcniquement, le test est sur navigateur de :
|
||||||
@ -60,7 +60,6 @@ A déployer par **`lecoffre_node/`** (d'autres projets externes sont ne dépenda
|
|||||||
- **`sdk_signer/`** (signature des processus métier et des identités/profils) - Debian + Node.js 20
|
- **`sdk_signer/`** (signature des processus métier et des identités/profils) - Debian + Node.js 20
|
||||||
- **`sdk_storage/`** (stockage temporaire) - Debian + Rust
|
- **`sdk_storage/`** (stockage temporaire) - Debian + Rust
|
||||||
- **`ihm_client/`** (iframe dans les frontend des projets pour interactions avec les clés privés Bitcoin Silent Payment) - Debian + Node.js 20
|
- **`ihm_client/`** (iframe dans les frontend des projets pour interactions avec les clés privés Bitcoin Silent Payment) - Debian + Node.js 20
|
||||||
- **`lecoffre-back-mini/`** (backend pour les API tierces du projet lecoffre) - Debian + Node.js 19
|
|
||||||
- **`lecoffre-front/`** (frontend du projet lecoffre) - Debian + Node.js 19
|
- **`lecoffre-front/`** (frontend du projet lecoffre) - Debian + Node.js 19
|
||||||
|
|
||||||
### Architecture Docker
|
### Architecture Docker
|
||||||
|
@ -37,8 +37,6 @@ Ces services suivent la chaîne applicative :
|
|||||||
|
|
||||||
| Service | Port | Dépendance | Script |
|
| Service | Port | Dépendance | Script |
|
||||||
|---------|------|------------|--------|
|
|---------|------|------------|--------|
|
||||||
| **lecoffre-back** | 8080 | sdk_relay (healthy) | `start-with-progress.sh` |
|
|
||||||
| **lecoffre-front** | 3004 | lecoffre-back (healthy) | `start-with-progress.sh` |
|
|
||||||
| **ihm_client** | 3003 | sdk_relay + sdk_storage | `start-with-progress.sh` |
|
| **ihm_client** | 3003 | sdk_relay + sdk_storage | `start-with-progress.sh` |
|
||||||
|
|
||||||
### **Phase 4: Services de Monitoring (Séquentiel, Indépendant)**
|
### **Phase 4: Services de Monitoring (Séquentiel, Indépendant)**
|
||||||
@ -147,7 +145,7 @@ docker compose start
|
|||||||
|
|
||||||
### **Dépendances Critiques**
|
### **Dépendances Critiques**
|
||||||
1. **bitcoin** → **blindbit** → **sdk_relay** : Chaîne blockchain
|
1. **bitcoin** → **blindbit** → **sdk_relay** : Chaîne blockchain
|
||||||
2. **sdk_relay** → **lecoffre-back** → **lecoffre-front** : Chaîne applicative
|
2. **sdk_relay** → **lecoffre-front** : Chaîne applicative
|
||||||
3. **loki** → **promtail** → **grafana** : Chaîne monitoring
|
3. **loki** → **promtail** → **grafana** : Chaîne monitoring
|
||||||
|
|
||||||
### **Healthchecks**
|
### **Healthchecks**
|
||||||
|
@ -39,7 +39,7 @@ NODE_ENV=production
|
|||||||
### 🌐 Configuration IDNOT (APIs notaires)
|
### 🌐 Configuration IDNOT (APIs notaires)
|
||||||
```bash
|
```bash
|
||||||
IDNOT_ANNUARY_BASE_URL=https://qual-api.notaires.fr/annuaire
|
IDNOT_ANNUARY_BASE_URL=https://qual-api.notaires.fr/annuaire
|
||||||
IDNOT_REDIRECT_URI=http://local.4nkweb.com:3000/authorized-client
|
IDNOT_REDIRECT_URI=http://dev3.4nkweb.com/authorized-client
|
||||||
IDNOT_TOKEN_URL=https://qual-connexion.idnot.fr/user/IdPOAuth2/token/idnot_idp_v1
|
IDNOT_TOKEN_URL=https://qual-connexion.idnot.fr/user/IdPOAuth2/token/idnot_idp_v1
|
||||||
IDNOT_API_BASE_URL=https://qual-api.notaires.fr
|
IDNOT_API_BASE_URL=https://qual-api.notaires.fr
|
||||||
```
|
```
|
||||||
@ -138,7 +138,6 @@ PROMTAIL_CONFIG_FILE=/etc/promtail/config.yml
|
|||||||
- ✅ `sdk_relay/.env`
|
- ✅ `sdk_relay/.env`
|
||||||
- ✅ `sdk_signer/.env`
|
- ✅ `sdk_signer/.env`
|
||||||
- ✅ `ihm_client/.env`
|
- ✅ `ihm_client/.env`
|
||||||
- ✅ `lecoffre-back-mini/.env`
|
|
||||||
- ✅ `lecoffre-front/.env`
|
- ✅ `lecoffre-front/.env`
|
||||||
|
|
||||||
### 🔄 Fichiers modifiés
|
### 🔄 Fichiers modifiés
|
||||||
@ -276,7 +275,6 @@ docker compose --env-file .env.master up -d
|
|||||||
sdk_relay/.env
|
sdk_relay/.env
|
||||||
sdk_signer/.env
|
sdk_signer/.env
|
||||||
ihm_client/.env
|
ihm_client/.env
|
||||||
lecoffre-back-mini/.env
|
|
||||||
lecoffre-front/.env
|
lecoffre-front/.env
|
||||||
├── Variables dupliquées
|
├── Variables dupliquées
|
||||||
├── Incohérences possibles
|
├── Incohérences possibles
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
| **bitcoin** | bitcoin-signet | - | 38332 (RPC)<br>38333 (P2P)<br>29000 (ZMQ hash)<br>29001 (ZMQ rawtx) | TCP | Réseau interne uniquement |
|
| **bitcoin** | bitcoin-signet | - | 38332 (RPC)<br>38333 (P2P)<br>29000 (ZMQ hash)<br>29001 (ZMQ rawtx) | TCP | Réseau interne uniquement |
|
||||||
| **blindbit** | blindbit-oracle | 0.0.0.0:8000 | 8000 | HTTP | http://0.0.0.0:8000 |
|
| **blindbit** | blindbit-oracle | 0.0.0.0:8000 | 8000 | HTTP | http://0.0.0.0:8000 |
|
||||||
| **sdk_relay** | sdk_relay | 0.0.0.0:8090<br>0.0.0.0:8091 | 8090 (WS)<br>8091 (HTTP) | WebSocket/HTTP | ws://0.0.0.0:8090<br>http://0.0.0.0:8091 |
|
| **sdk_relay** | sdk_relay | 0.0.0.0:8090<br>0.0.0.0:8091 | 8090 (WS)<br>8091 (HTTP) | WebSocket/HTTP | ws://0.0.0.0:8090<br>http://0.0.0.0:8091 |
|
||||||
| **lecoffre-back** | lecoffre-back | 0.0.0.0:8080 | 8080 | HTTP | http://0.0.0.0:8080 |
|
|
||||||
| **lecoffre-front** | lecoffre-front | 127.0.0.2:3004 | 3000 | HTTP | http://127.0.0.2:3004 |
|
| **lecoffre-front** | lecoffre-front | 127.0.0.2:3004 | 3000 | HTTP | http://127.0.0.2:3004 |
|
||||||
| **ihm_client** | ihm_client | 0.0.0.0:3003 | 3003 | HTTP | http://0.0.0.0:3003 |
|
| **ihm_client** | ihm_client | 0.0.0.0:3003 | 3003 | HTTP | http://0.0.0.0:3003 |
|
||||||
| **sdk_signer** | sdk_signer | 0.0.0.0:3001 | 3001 | HTTP/WebSocket | http://0.0.0.0:3001 |
|
| **sdk_signer** | sdk_signer | 0.0.0.0:3001 | 3001 | HTTP/WebSocket | http://0.0.0.0:3001 |
|
||||||
@ -48,15 +47,13 @@
|
|||||||
|-------|-------------|------|-----------|-------------|
|
|-------|-------------|------|-----------|-------------|
|
||||||
| **/** | ihm_client | 3003 | HTTP | Interface principale |
|
| **/** | ihm_client | 3003 | HTTP | Interface principale |
|
||||||
| **/lecoffre** | lecoffre-front | 3004 | HTTP | Application LeCoffre |
|
| **/lecoffre** | lecoffre-front | 3004 | HTTP | Application LeCoffre |
|
||||||
| **/api/** | lecoffre-back | 8080 | HTTP | API Backend |
|
|
||||||
| **/back/** | lecoffre-back | 8080 | HTTP | API Backend (alias) |
|
|
||||||
| **/ws/** | sdk_relay | 8090 | WebSocket | Relay WebSocket |
|
| **/ws/** | sdk_relay | 8090 | WebSocket | Relay WebSocket |
|
||||||
| **/signer/** | sdk_signer | 3001 | HTTP/WebSocket | Service Signer |
|
| **/signer/** | sdk_signer | 3001 | HTTP/WebSocket | Service Signer |
|
||||||
| **/src/service-workers/** | ihm_client | 3003 | HTTP | Service Workers |
|
| **/src/service-workers/** | ihm_client | 3003 | HTTP | Service Workers |
|
||||||
| **/grafana/** | grafana | 3005 | HTTP | Interface de monitoring |
|
| **/grafana/** | grafana | 3005 | HTTP | Interface de monitoring |
|
||||||
| **/loki/** | loki | 3100 | HTTP | API de logs |
|
| **/loki/** | loki | 3100 | HTTP | API de logs |
|
||||||
|
|
||||||
### 🏠 **Proxy Nginx Local (local.4nkweb.com)**
|
### 🏠 **Proxy Nginx Local (dev3.4nkweb.com)**
|
||||||
|
|
||||||
| Route | Destination | Port | Protocole | Description |
|
| Route | Destination | Port | Protocole | Description |
|
||||||
|-------|-------------|------|-----------|-------------|
|
|-------|-------------|------|-----------|-------------|
|
||||||
@ -114,7 +111,6 @@ Internet → dev4.4nkweb.com (Nginx) → Services Locaux
|
|||||||
```
|
```
|
||||||
|
|
||||||
1. **Frontend** : `https://dev4.4nkweb.com/lecoffre` → lecoffre-front (127.0.0.2:3004)
|
1. **Frontend** : `https://dev4.4nkweb.com/lecoffre` → lecoffre-front (127.0.0.2:3004)
|
||||||
2. **API** : `https://dev4.4nkweb.com/api/` → lecoffre-back (0.0.0.0:8080)
|
|
||||||
3. **IHM** : `https://dev4.4nkweb.com/` → ihm_client (0.0.0.0:3003)
|
3. **IHM** : `https://dev4.4nkweb.com/` → ihm_client (0.0.0.0:3003)
|
||||||
4. **WebSocket** : `https://dev4.4nkweb.com/ws/` → sdk_relay (0.0.0.0:8090)
|
4. **WebSocket** : `https://dev4.4nkweb.com/ws/` → sdk_relay (0.0.0.0:8090)
|
||||||
5. **Monitoring** : `https://dev4.4nkweb.com/grafana/` → grafana (127.0.0.1:3005)
|
5. **Monitoring** : `https://dev4.4nkweb.com/grafana/` → grafana (127.0.0.1:3005)
|
||||||
@ -123,7 +119,7 @@ Internet → dev4.4nkweb.com (Nginx) → Services Locaux
|
|||||||
### 🔗 **Flux de Redirection**
|
### 🔗 **Flux de Redirection**
|
||||||
|
|
||||||
```
|
```
|
||||||
local.4nkdev.com → local.4nkweb.com → https://dev4.4nkweb.com/lecoffre
|
local.4nkdev.com → dev3.4nkweb.com → https://dev4.4nkweb.com/lecoffre
|
||||||
```
|
```
|
||||||
|
|
||||||
### 🌐 **Flux Externes**
|
### 🌐 **Flux Externes**
|
||||||
@ -153,7 +149,6 @@ Services → Logs Centralisés → Promtail → Loki → Grafana
|
|||||||
| **sdk_relay** | `logs/sdk_relay/` | `./logs/sdk_relay:/var/log/sdk_relay` | Logs Relay |
|
| **sdk_relay** | `logs/sdk_relay/` | `./logs/sdk_relay:/var/log/sdk_relay` | Logs Relay |
|
||||||
| **sdk_signer** | `logs/sdk_signer/` | `./logs/sdk_signer:/var/log/sdk_signer` | Logs Signer |
|
| **sdk_signer** | `logs/sdk_signer/` | `./logs/sdk_signer:/var/log/sdk_signer` | Logs Signer |
|
||||||
| **sdk_storage** | `logs/sdk_storage/` | `./logs/sdk_storage:/var/log/sdk_storage` | Logs Storage |
|
| **sdk_storage** | `logs/sdk_storage/` | `./logs/sdk_storage:/var/log/sdk_storage` | Logs Storage |
|
||||||
| **lecoffre-back** | `logs/lecoffre-back/` | `./logs/lecoffre-back:/var/log/lecoffre-back` | Logs Backend |
|
|
||||||
| **lecoffre-front** | `logs/lecoffre-front/` | `./logs/lecoffre-front:/var/log/lecoffre-front` | Logs Frontend |
|
| **lecoffre-front** | `logs/lecoffre-front/` | `./logs/lecoffre-front:/var/log/lecoffre-front` | Logs Frontend |
|
||||||
| **ihm_client** | `logs/ihm_client/` | `./logs/ihm_client:/var/log/ihm_client` | Logs IHM |
|
| **ihm_client** | `logs/ihm_client/` | `./logs/ihm_client:/var/log/ihm_client` | Logs IHM |
|
||||||
| **miner** | `logs/miner/` | `./logs/miner:/var/log/miner` | Logs Mineur |
|
| **miner** | `logs/miner/` | `./logs/miner:/var/log/miner` | Logs Mineur |
|
||||||
@ -200,7 +195,6 @@ Selon les règles du projet, l'ordre de démarrage est :
|
|||||||
5. **sdk_relay** - Relais des transactions
|
5. **sdk_relay** - Relais des transactions
|
||||||
6. **sdk_signer** - Signature des processus
|
6. **sdk_signer** - Signature des processus
|
||||||
7. **ihm_client** - Interface utilisateur
|
7. **ihm_client** - Interface utilisateur
|
||||||
8. **lecoffre-back** - Backend API
|
|
||||||
9. **lecoffre-front** - Frontend application
|
9. **lecoffre-front** - Frontend application
|
||||||
|
|
||||||
### 📊 **Services de Monitoring**
|
### 📊 **Services de Monitoring**
|
||||||
@ -311,9 +305,9 @@ docker compose --env-file .env.master up -d
|
|||||||
| **dev4.4nkweb.com** | 443 | `/signer/` | SDK Signer (3001) | HTTPS | ✅ Actif |
|
| **dev4.4nkweb.com** | 443 | `/signer/` | SDK Signer (3001) | HTTPS | ✅ Actif |
|
||||||
| **dev4.4nkweb.com** | 443 | `/blindbit/` | BlindBit (8000) | HTTPS | ✅ Actif |
|
| **dev4.4nkweb.com** | 443 | `/blindbit/` | BlindBit (8000) | HTTPS | ✅ Actif |
|
||||||
| **dev4.4nkweb.com** | 443 | `/` | IHM Client (3003) | HTTPS | ✅ Actif |
|
| **dev4.4nkweb.com** | 443 | `/` | IHM Client (3003) | HTTPS | ✅ Actif |
|
||||||
| **local.4nkweb.com** | 80 | `/` | Redirection port 3000 | HTTP | ✅ Actif |
|
| **dev3.4nkweb.com** | 80 | `/` | Redirection port 3000 | HTTP | ✅ Actif |
|
||||||
| **local.4nkweb.com** | 3000 | `/lecoffre/` | Frontend (3004) | HTTP | ✅ Actif |
|
| **dev3.4nkweb.com** | 3000 | `/lecoffre/` | Frontend (3004) | HTTP | ✅ Actif |
|
||||||
| **local.4nkweb.com** | 3000 | `/authorized-client` | Frontend (3004) | HTTP | ✅ Actif |
|
| **dev3.4nkweb.com** | 3000 | `/authorized-client` | Frontend (3004) | HTTP | ✅ Actif |
|
||||||
|
|
||||||
### 🔧 **Configuration des Certificats SSL**
|
### 🔧 **Configuration des Certificats SSL**
|
||||||
|
|
||||||
@ -327,8 +321,8 @@ docker compose --env-file .env.master up -d
|
|||||||
|---------|-------------|--------|
|
|---------|-------------|--------|
|
||||||
| `/etc/nginx/sites-enabled/dev4.4nkweb.com.conf` | HTTP + Redirection | ✅ Actif |
|
| `/etc/nginx/sites-enabled/dev4.4nkweb.com.conf` | HTTP + Redirection | ✅ Actif |
|
||||||
| `/etc/nginx/sites-enabled/dev4.4nkweb.com-https.conf` | HTTPS complet | ✅ Actif |
|
| `/etc/nginx/sites-enabled/dev4.4nkweb.com-https.conf` | HTTPS complet | ✅ Actif |
|
||||||
| `/etc/nginx/sites-enabled/local.4nkweb.com.conf` | Local HTTP | ✅ Actif |
|
| `/etc/nginx/sites-enabled/dev3.4nkweb.com.conf` | Local HTTP | ✅ Actif |
|
||||||
| `/etc/nginx/sites-enabled/local.4nkweb.com-3000.conf` | Local port 3000 | ✅ Actif |
|
| `/etc/nginx/sites-enabled/dev3.4nkweb.com-3000.conf` | Local port 3000 | ✅ Actif |
|
||||||
|
|
||||||
### 🧹 **Configuration Centralisée**
|
### 🧹 **Configuration Centralisée**
|
||||||
|
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
# Déploie toute les CI
|
# Déploie toute les CI
|
||||||
|
|
||||||
|
Apprend et retient : `IA_agents/prompts/prompt-global.md`.
|
||||||
|
|
||||||
|
Démarre en lisant tous les documents de `IA_agents/`.
|
||||||
|
Tous les documents des projets doivent être dans un dossier `docs/`
|
||||||
---
|
---
|
||||||
|
|
||||||
## Todo
|
## Todo
|
||||||
@ -24,6 +28,7 @@
|
|||||||
* [ ] Supprime du repos distant tous les fichiers non suivis de tout l'historique des commit de la branche.
|
* [ ] Supprime du repos distant tous les fichiers non suivis de tout l'historique des commit de la branche.
|
||||||
* [ ] Supprime du repos distant tous les fichiers non suivis de tout l'historique des commit de la branche. Soit très prudent vérifie avant.
|
* [ ] Supprime du repos distant tous les fichiers non suivis de tout l'historique des commit de la branche. Soit très prudent vérifie avant.
|
||||||
* [ ] pour tronquer l’historique Git de la branche « ext » et ne conserver que les cinq derniers commits avec les paramètre suivants `BR="ext"`, `REMOTE="origin"`, `DATE_TAG="$(date -u +'%Y%m%d-%H%M%S')"`, `BACKUP_TAG="backup/${BR}-pre-truncate-${DATE_TAG}"` pour `repo_clean.sh`. Soit très prudent vérifie avant.
|
* [ ] pour tronquer l’historique Git de la branche « ext » et ne conserver que les cinq derniers commits avec les paramètre suivants `BR="ext"`, `REMOTE="origin"`, `DATE_TAG="$(date -u +'%Y%m%d-%H%M%S')"`, `BACKUP_TAG="backup/${BR}-pre-truncate-${DATE_TAG}"` pour `repo_clean.sh`. Soit très prudent vérifie avant.
|
||||||
|
* [ ] Relance tous les services de `lecoffre_node/` avec `--remove-orphans` et affiche les variables d'environnement de chacun
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -1,17 +1,15 @@
|
|||||||
# Prompt de Déploiement LeCoffre Node
|
# Prompt de Déploiement LeCoffre Node
|
||||||
|
|
||||||
|
Apprend et retient : `IA_agents/prompts/prompt-global.md`.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 🎯 Prompt pour l'Agent IA
|
## 🎯 Prompt pour l'Agent IA
|
||||||
|
|
||||||
Déploie l'architecture LeCoffre Node complète en respectant strictement les consignes de déploiement.
|
Déploie l'architecture LeCoffre Node complète en respectant strictement les consignes de déploiement.
|
||||||
Arrete et nettoie tous les services, images, tests, commandes, éditions... encore actives avant de relancer proprement.
|
Arrete et nettoie tous les services, images, tests, commandes, éditions... encore actives avant de relancer proprement.
|
||||||
Toujours veiller à supprimer les fichiers distants non suivis
|
|
||||||
A la fin met bien à jour les documents de `IA_agents/` et ses sous dossiers, corrigés et complétés.
|
|
||||||
Si un processus est en attente alors utiliser les scripts de monitoring, si ils sont peu utiles pour comprendre la raison de l'attente ou la progression, alors améliore les.
|
Si un processus est en attente alors utiliser les scripts de monitoring, si ils sont peu utiles pour comprendre la raison de l'attente ou la progression, alors améliore les.
|
||||||
Important : ne simplifie jamais face à un problème mais résout le sans alternative manuelle (sauf pour tester, mais il faudra corriger quand même).
|
|
||||||
Fait des corrections sans contourement et durables pour fluididier les prochains déploiements c'est plus important que d'avancer dans la toto.
|
|
||||||
Ne modifie pas les valeurs des conf, demande toujours avant.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@ -220,8 +218,7 @@ docker compose start
|
|||||||
7. sdk_relay (attend blindbit)
|
7. sdk_relay (attend blindbit)
|
||||||
|
|
||||||
**Phase 3: Services applicatifs (séquentiel)**
|
**Phase 3: Services applicatifs (séquentiel)**
|
||||||
8. lecoffre-back (attend sdk_relay)
|
9. lecoffre-front
|
||||||
9. lecoffre-front (attend lecoffre-back)
|
|
||||||
10. ihm_client (attend sdk_relay + sdk_storage)
|
10. ihm_client (attend sdk_relay + sdk_storage)
|
||||||
|
|
||||||
**Phase 4: Services de monitoring (séquentiel, indépendant)**
|
**Phase 4: Services de monitoring (séquentiel, indépendant)**
|
||||||
|
6
IA_agents/prompts/prompt-global.md
Normal file
6
IA_agents/prompts/prompt-global.md
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
# Directives globales
|
||||||
|
|
||||||
|
- On parle en français.
|
||||||
|
- Important : ne simplifie jamais face à un problème mais résout le sans alternative manuelle (sauf pour tester, mais il faudra corriger quand même).
|
||||||
|
- Fait des corrections sans contourement et durables pour fluididier les prochains déploiements c'est plus important que d'avancer dans la toto.
|
||||||
|
- Ne modifie pas les valeurs des conf, demande toujours avant.
|
@ -1,5 +1,7 @@
|
|||||||
# Démarrage assistance au développement
|
# Démarrage assistance au développement
|
||||||
|
|
||||||
|
Apprend et retient : `IA_agents/prompts/prompt-global.md`.
|
||||||
|
|
||||||
Agis en tant qu’assistant expert en développement logiciel et en DevOps.
|
Agis en tant qu’assistant expert en développement logiciel et en DevOps.
|
||||||
Ton rôle est d’accompagner la mise en place, la configuration et l’automatisation de solutions techniques, en respectant les bonnes pratiques de sécurité, de performance et de résilience.
|
Ton rôle est d’accompagner la mise en place, la configuration et l’automatisation de solutions techniques, en respectant les bonnes pratiques de sécurité, de performance et de résilience.
|
||||||
|
|
||||||
|
@ -1,6 +1,13 @@
|
|||||||
# Todo management
|
# Todo management
|
||||||
|
|
||||||
* [ ] Affiche l'état de cette liste de tâche en sortie mais ne modifie pas l'avancement dans ce fichier.
|
Apprend et retient : `IA_agents/prompts/prompt-global.md`.
|
||||||
|
|
||||||
|
--
|
||||||
|
|
||||||
|
## TODO
|
||||||
|
|
||||||
|
* [ ] Affiche l'état les listes de tâche en sortie mais ne modifie pas l'avancement dans ce fichier.
|
||||||
* [ ] Enchaine les actions sans confirmations sauf de sécurité, de prudence ou de besoin de précisions.
|
* [ ] Enchaine les actions sans confirmations sauf de sécurité, de prudence ou de besoin de précisions.
|
||||||
* [ ] Améliore les consignes dans `IA_agents` au fur et à mesure.
|
* [ ] Améliore les consignes dans `IA_agents` au fur et à mesure.
|
||||||
* [ ] Met à jour les `.cursorrules` en fonction de mes retours sur tes actions.
|
* [ ] Met à jour les `.cursorrules` en fonction de mes retours sur tes actions.
|
||||||
|
* [ ] Ne dis pas ce que tu vas faire mais fait le directement car je le vois et je peux intervenir, je suis responsable de tes actions.
|
@ -1,5 +1,7 @@
|
|||||||
# TODO
|
# TODO
|
||||||
|
|
||||||
|
Apprend et retient : `IA_agents/prompts/prompt-global.md`.
|
||||||
|
|
||||||
Dans la page status (`lecoffre_node/web/status`):
|
Dans la page status (`lecoffre_node/web/status`):
|
||||||
* [ ] Ajouter l'État du miner
|
* [ ] Ajouter l'État du miner
|
||||||
* [ ] Du bootsrap tor
|
* [ ] Du bootsrap tor
|
||||||
|
@ -15,7 +15,6 @@ Environnement de développement centralisé pour tous les dépôts 4NK et le pro
|
|||||||
├── sdk_common/ # Composants communs 4NK
|
├── sdk_common/ # Composants communs 4NK
|
||||||
├── sdk-signer-client/ # Client signeur 4NK
|
├── sdk-signer-client/ # Client signeur 4NK
|
||||||
├── ihm_client/ # Interface utilisateur LeCoffre
|
├── ihm_client/ # Interface utilisateur LeCoffre
|
||||||
├── lecoffre-back-mini/ # API Backend LeCoffre
|
|
||||||
├── lecoffre-front/ # Frontend Next.js LeCoffre
|
├── lecoffre-front/ # Frontend Next.js LeCoffre
|
||||||
├── doc_api/ # Documentation API 4NK
|
├── doc_api/ # Documentation API 4NK
|
||||||
├── IA_agents/ # 🧠 Agents IA - Contexte et outillage complet
|
├── IA_agents/ # 🧠 Agents IA - Contexte et outillage complet
|
||||||
@ -65,7 +64,7 @@ cd lecoffre_node
|
|||||||
| **WebSocket** | ws://localhost/ws/ | Communication temps réel |
|
| **WebSocket** | ws://localhost/ws/ | Communication temps réel |
|
||||||
| **Status Page** | http://localhost/status/ | Tableau de bord |
|
| **Status Page** | http://localhost/status/ | Tableau de bord |
|
||||||
| **Grafana** | http://localhost/grafana/ | Monitoring |
|
| **Grafana** | http://localhost/grafana/ | Monitoring |
|
||||||
| **Redirections IdNot** | http://local.4nkweb.com:3000/ | Redirections externes |
|
| **Redirections IdNot** | http://dev3.4nkweb.com/ | Redirections externes |
|
||||||
| **HTTPS** | https://localhost/ | Accès sécurisé |
|
| **HTTPS** | https://localhost/ | Accès sécurisé |
|
||||||
|
|
||||||
### Ports
|
### Ports
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 3f3fdc6b55f9375912442f075c4ca438b854cf7c
|
Subproject commit 7681c9966b7be5cf1c37be08f9d177590535a611
|
@ -1 +1 @@
|
|||||||
Subproject commit 3ea0c10bba5e67dcd1c057d08b60ee97660adc9c
|
Subproject commit 32f1c7946c151957ca145e367ee71bd78f46ff01
|
@ -1 +0,0 @@
|
|||||||
Subproject commit 1dba7ca91c649a3bfd74627f2e1277ba85a56b98
|
|
@ -1 +0,0 @@
|
|||||||
ref: refs/heads/ext
|
|
@ -1,8 +0,0 @@
|
|||||||
[core]
|
|
||||||
repositoryformatversion = 0
|
|
||||||
filemode = true
|
|
||||||
bare = true
|
|
||||||
[remote "origin"]
|
|
||||||
url = /home/debian/4NK_env/lecoffre_node
|
|
||||||
fetch = +refs/*:refs/*
|
|
||||||
mirror = true
|
|
@ -1 +0,0 @@
|
|||||||
Unnamed repository; edit this file 'description' to name the repository.
|
|
@ -1,15 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to check the commit log message taken by
|
|
||||||
# applypatch from an e-mail message.
|
|
||||||
#
|
|
||||||
# The hook should exit with non-zero status after issuing an
|
|
||||||
# appropriate message if it wants to stop the commit. The hook is
|
|
||||||
# allowed to edit the commit message file.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "applypatch-msg".
|
|
||||||
|
|
||||||
. git-sh-setup
|
|
||||||
commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
|
|
||||||
test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
|
|
||||||
:
|
|
@ -1,24 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to check the commit log message.
|
|
||||||
# Called by "git commit" with one argument, the name of the file
|
|
||||||
# that has the commit message. The hook should exit with non-zero
|
|
||||||
# status after issuing an appropriate message if it wants to stop the
|
|
||||||
# commit. The hook is allowed to edit the commit message file.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "commit-msg".
|
|
||||||
|
|
||||||
# Uncomment the below to add a Signed-off-by line to the message.
|
|
||||||
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
|
|
||||||
# hook is more suited to it.
|
|
||||||
#
|
|
||||||
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
|
||||||
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
|
|
||||||
|
|
||||||
# This example catches duplicate Signed-off-by lines.
|
|
||||||
|
|
||||||
test "" = "$(grep '^Signed-off-by: ' "$1" |
|
|
||||||
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
|
|
||||||
echo >&2 Duplicate Signed-off-by lines.
|
|
||||||
exit 1
|
|
||||||
}
|
|
@ -1,174 +0,0 @@
|
|||||||
#!/usr/bin/perl
|
|
||||||
|
|
||||||
use strict;
|
|
||||||
use warnings;
|
|
||||||
use IPC::Open2;
|
|
||||||
|
|
||||||
# An example hook script to integrate Watchman
|
|
||||||
# (https://facebook.github.io/watchman/) with git to speed up detecting
|
|
||||||
# new and modified files.
|
|
||||||
#
|
|
||||||
# The hook is passed a version (currently 2) and last update token
|
|
||||||
# formatted as a string and outputs to stdout a new update token and
|
|
||||||
# all files that have been modified since the update token. Paths must
|
|
||||||
# be relative to the root of the working tree and separated by a single NUL.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "query-watchman" and set
|
|
||||||
# 'git config core.fsmonitor .git/hooks/query-watchman'
|
|
||||||
#
|
|
||||||
my ($version, $last_update_token) = @ARGV;
|
|
||||||
|
|
||||||
# Uncomment for debugging
|
|
||||||
# print STDERR "$0 $version $last_update_token\n";
|
|
||||||
|
|
||||||
# Check the hook interface version
|
|
||||||
if ($version ne 2) {
|
|
||||||
die "Unsupported query-fsmonitor hook version '$version'.\n" .
|
|
||||||
"Falling back to scanning...\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
my $git_work_tree = get_working_dir();
|
|
||||||
|
|
||||||
my $retry = 1;
|
|
||||||
|
|
||||||
my $json_pkg;
|
|
||||||
eval {
|
|
||||||
require JSON::XS;
|
|
||||||
$json_pkg = "JSON::XS";
|
|
||||||
1;
|
|
||||||
} or do {
|
|
||||||
require JSON::PP;
|
|
||||||
$json_pkg = "JSON::PP";
|
|
||||||
};
|
|
||||||
|
|
||||||
launch_watchman();
|
|
||||||
|
|
||||||
sub launch_watchman {
|
|
||||||
my $o = watchman_query();
|
|
||||||
if (is_work_tree_watched($o)) {
|
|
||||||
output_result($o->{clock}, @{$o->{files}});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sub output_result {
|
|
||||||
my ($clockid, @files) = @_;
|
|
||||||
|
|
||||||
# Uncomment for debugging watchman output
|
|
||||||
# open (my $fh, ">", ".git/watchman-output.out");
|
|
||||||
# binmode $fh, ":utf8";
|
|
||||||
# print $fh "$clockid\n@files\n";
|
|
||||||
# close $fh;
|
|
||||||
|
|
||||||
binmode STDOUT, ":utf8";
|
|
||||||
print $clockid;
|
|
||||||
print "\0";
|
|
||||||
local $, = "\0";
|
|
||||||
print @files;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub watchman_clock {
|
|
||||||
my $response = qx/watchman clock "$git_work_tree"/;
|
|
||||||
die "Failed to get clock id on '$git_work_tree'.\n" .
|
|
||||||
"Falling back to scanning...\n" if $? != 0;
|
|
||||||
|
|
||||||
return $json_pkg->new->utf8->decode($response);
|
|
||||||
}
|
|
||||||
|
|
||||||
sub watchman_query {
|
|
||||||
my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
|
|
||||||
or die "open2() failed: $!\n" .
|
|
||||||
"Falling back to scanning...\n";
|
|
||||||
|
|
||||||
# In the query expression below we're asking for names of files that
|
|
||||||
# changed since $last_update_token but not from the .git folder.
|
|
||||||
#
|
|
||||||
# To accomplish this, we're using the "since" generator to use the
|
|
||||||
# recency index to select candidate nodes and "fields" to limit the
|
|
||||||
# output to file names only. Then we're using the "expression" term to
|
|
||||||
# further constrain the results.
|
|
||||||
my $last_update_line = "";
|
|
||||||
if (substr($last_update_token, 0, 1) eq "c") {
|
|
||||||
$last_update_token = "\"$last_update_token\"";
|
|
||||||
$last_update_line = qq[\n"since": $last_update_token,];
|
|
||||||
}
|
|
||||||
my $query = <<" END";
|
|
||||||
["query", "$git_work_tree", {$last_update_line
|
|
||||||
"fields": ["name"],
|
|
||||||
"expression": ["not", ["dirname", ".git"]]
|
|
||||||
}]
|
|
||||||
END
|
|
||||||
|
|
||||||
# Uncomment for debugging the watchman query
|
|
||||||
# open (my $fh, ">", ".git/watchman-query.json");
|
|
||||||
# print $fh $query;
|
|
||||||
# close $fh;
|
|
||||||
|
|
||||||
print CHLD_IN $query;
|
|
||||||
close CHLD_IN;
|
|
||||||
my $response = do {local $/; <CHLD_OUT>};
|
|
||||||
|
|
||||||
# Uncomment for debugging the watch response
|
|
||||||
# open ($fh, ">", ".git/watchman-response.json");
|
|
||||||
# print $fh $response;
|
|
||||||
# close $fh;
|
|
||||||
|
|
||||||
die "Watchman: command returned no output.\n" .
|
|
||||||
"Falling back to scanning...\n" if $response eq "";
|
|
||||||
die "Watchman: command returned invalid output: $response\n" .
|
|
||||||
"Falling back to scanning...\n" unless $response =~ /^\{/;
|
|
||||||
|
|
||||||
return $json_pkg->new->utf8->decode($response);
|
|
||||||
}
|
|
||||||
|
|
||||||
sub is_work_tree_watched {
|
|
||||||
my ($output) = @_;
|
|
||||||
my $error = $output->{error};
|
|
||||||
if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
|
|
||||||
$retry--;
|
|
||||||
my $response = qx/watchman watch "$git_work_tree"/;
|
|
||||||
die "Failed to make watchman watch '$git_work_tree'.\n" .
|
|
||||||
"Falling back to scanning...\n" if $? != 0;
|
|
||||||
$output = $json_pkg->new->utf8->decode($response);
|
|
||||||
$error = $output->{error};
|
|
||||||
die "Watchman: $error.\n" .
|
|
||||||
"Falling back to scanning...\n" if $error;
|
|
||||||
|
|
||||||
# Uncomment for debugging watchman output
|
|
||||||
# open (my $fh, ">", ".git/watchman-output.out");
|
|
||||||
# close $fh;
|
|
||||||
|
|
||||||
# Watchman will always return all files on the first query so
|
|
||||||
# return the fast "everything is dirty" flag to git and do the
|
|
||||||
# Watchman query just to get it over with now so we won't pay
|
|
||||||
# the cost in git to look up each individual file.
|
|
||||||
my $o = watchman_clock();
|
|
||||||
$error = $output->{error};
|
|
||||||
|
|
||||||
die "Watchman: $error.\n" .
|
|
||||||
"Falling back to scanning...\n" if $error;
|
|
||||||
|
|
||||||
output_result($o->{clock}, ("/"));
|
|
||||||
$last_update_token = $o->{clock};
|
|
||||||
|
|
||||||
eval { launch_watchman() };
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
die "Watchman: $error.\n" .
|
|
||||||
"Falling back to scanning...\n" if $error;
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub get_working_dir {
|
|
||||||
my $working_dir;
|
|
||||||
if ($^O =~ 'msys' || $^O =~ 'cygwin') {
|
|
||||||
$working_dir = Win32::GetCwd();
|
|
||||||
$working_dir =~ tr/\\/\//;
|
|
||||||
} else {
|
|
||||||
require Cwd;
|
|
||||||
$working_dir = Cwd::cwd();
|
|
||||||
}
|
|
||||||
|
|
||||||
return $working_dir;
|
|
||||||
}
|
|
@ -1,8 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to prepare a packed repository for use over
|
|
||||||
# dumb transports.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "post-update".
|
|
||||||
|
|
||||||
exec git update-server-info
|
|
@ -1,14 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to verify what is about to be committed
|
|
||||||
# by applypatch from an e-mail message.
|
|
||||||
#
|
|
||||||
# The hook should exit with non-zero status after issuing an
|
|
||||||
# appropriate message if it wants to stop the commit.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "pre-applypatch".
|
|
||||||
|
|
||||||
. git-sh-setup
|
|
||||||
precommit="$(git rev-parse --git-path hooks/pre-commit)"
|
|
||||||
test -x "$precommit" && exec "$precommit" ${1+"$@"}
|
|
||||||
:
|
|
@ -1,49 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to verify what is about to be committed.
|
|
||||||
# Called by "git commit" with no arguments. The hook should
|
|
||||||
# exit with non-zero status after issuing an appropriate message if
|
|
||||||
# it wants to stop the commit.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "pre-commit".
|
|
||||||
|
|
||||||
if git rev-parse --verify HEAD >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
against=HEAD
|
|
||||||
else
|
|
||||||
# Initial commit: diff against an empty tree object
|
|
||||||
against=$(git hash-object -t tree /dev/null)
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If you want to allow non-ASCII filenames set this variable to true.
|
|
||||||
allownonascii=$(git config --type=bool hooks.allownonascii)
|
|
||||||
|
|
||||||
# Redirect output to stderr.
|
|
||||||
exec 1>&2
|
|
||||||
|
|
||||||
# Cross platform projects tend to avoid non-ASCII filenames; prevent
|
|
||||||
# them from being added to the repository. We exploit the fact that the
|
|
||||||
# printable range starts at the space character and ends with tilde.
|
|
||||||
if [ "$allownonascii" != "true" ] &&
|
|
||||||
# Note that the use of brackets around a tr range is ok here, (it's
|
|
||||||
# even required, for portability to Solaris 10's /usr/bin/tr), since
|
|
||||||
# the square bracket bytes happen to fall in the designated range.
|
|
||||||
test $(git diff-index --cached --name-only --diff-filter=A -z $against |
|
|
||||||
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
|
|
||||||
then
|
|
||||||
cat <<\EOF
|
|
||||||
Error: Attempt to add a non-ASCII file name.
|
|
||||||
|
|
||||||
This can cause problems if you want to work with people on other platforms.
|
|
||||||
|
|
||||||
To be portable it is advisable to rename the file.
|
|
||||||
|
|
||||||
If you know what you are doing you can disable this check using:
|
|
||||||
|
|
||||||
git config hooks.allownonascii true
|
|
||||||
EOF
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If there are whitespace errors, print the offending file names and fail.
|
|
||||||
exec git diff-index --check --cached $against --
|
|
@ -1,13 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to verify what is about to be committed.
|
|
||||||
# Called by "git merge" with no arguments. The hook should
|
|
||||||
# exit with non-zero status after issuing an appropriate message to
|
|
||||||
# stderr if it wants to stop the merge commit.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "pre-merge-commit".
|
|
||||||
|
|
||||||
. git-sh-setup
|
|
||||||
test -x "$GIT_DIR/hooks/pre-commit" &&
|
|
||||||
exec "$GIT_DIR/hooks/pre-commit"
|
|
||||||
:
|
|
@ -1,53 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# An example hook script to verify what is about to be pushed. Called by "git
|
|
||||||
# push" after it has checked the remote status, but before anything has been
|
|
||||||
# pushed. If this script exits with a non-zero status nothing will be pushed.
|
|
||||||
#
|
|
||||||
# This hook is called with the following parameters:
|
|
||||||
#
|
|
||||||
# $1 -- Name of the remote to which the push is being done
|
|
||||||
# $2 -- URL to which the push is being done
|
|
||||||
#
|
|
||||||
# If pushing without using a named remote those arguments will be equal.
|
|
||||||
#
|
|
||||||
# Information about the commits which are being pushed is supplied as lines to
|
|
||||||
# the standard input in the form:
|
|
||||||
#
|
|
||||||
# <local ref> <local oid> <remote ref> <remote oid>
|
|
||||||
#
|
|
||||||
# This sample shows how to prevent push of commits where the log message starts
|
|
||||||
# with "WIP" (work in progress).
|
|
||||||
|
|
||||||
remote="$1"
|
|
||||||
url="$2"
|
|
||||||
|
|
||||||
zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
|
|
||||||
|
|
||||||
while read local_ref local_oid remote_ref remote_oid
|
|
||||||
do
|
|
||||||
if test "$local_oid" = "$zero"
|
|
||||||
then
|
|
||||||
# Handle delete
|
|
||||||
:
|
|
||||||
else
|
|
||||||
if test "$remote_oid" = "$zero"
|
|
||||||
then
|
|
||||||
# New branch, examine all commits
|
|
||||||
range="$local_oid"
|
|
||||||
else
|
|
||||||
# Update to existing branch, examine new commits
|
|
||||||
range="$remote_oid..$local_oid"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for WIP commit
|
|
||||||
commit=$(git rev-list -n 1 --grep '^WIP' "$range")
|
|
||||||
if test -n "$commit"
|
|
||||||
then
|
|
||||||
echo >&2 "Found WIP commit in $local_ref, not pushing"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
exit 0
|
|
@ -1,169 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# Copyright (c) 2006, 2008 Junio C Hamano
|
|
||||||
#
|
|
||||||
# The "pre-rebase" hook is run just before "git rebase" starts doing
|
|
||||||
# its job, and can prevent the command from running by exiting with
|
|
||||||
# non-zero status.
|
|
||||||
#
|
|
||||||
# The hook is called with the following parameters:
|
|
||||||
#
|
|
||||||
# $1 -- the upstream the series was forked from.
|
|
||||||
# $2 -- the branch being rebased (or empty when rebasing the current branch).
|
|
||||||
#
|
|
||||||
# This sample shows how to prevent topic branches that are already
|
|
||||||
# merged to 'next' branch from getting rebased, because allowing it
|
|
||||||
# would result in rebasing already published history.
|
|
||||||
|
|
||||||
publish=next
|
|
||||||
basebranch="$1"
|
|
||||||
if test "$#" = 2
|
|
||||||
then
|
|
||||||
topic="refs/heads/$2"
|
|
||||||
else
|
|
||||||
topic=`git symbolic-ref HEAD` ||
|
|
||||||
exit 0 ;# we do not interrupt rebasing detached HEAD
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$topic" in
|
|
||||||
refs/heads/??/*)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
exit 0 ;# we do not interrupt others.
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Now we are dealing with a topic branch being rebased
|
|
||||||
# on top of master. Is it OK to rebase it?
|
|
||||||
|
|
||||||
# Does the topic really exist?
|
|
||||||
git show-ref -q "$topic" || {
|
|
||||||
echo >&2 "No such branch $topic"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Is topic fully merged to master?
|
|
||||||
not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
|
|
||||||
if test -z "$not_in_master"
|
|
||||||
then
|
|
||||||
echo >&2 "$topic is fully merged to master; better remove it."
|
|
||||||
exit 1 ;# we could allow it, but there is no point.
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Is topic ever merged to next? If so you should not be rebasing it.
|
|
||||||
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
|
|
||||||
only_next_2=`git rev-list ^master ${publish} | sort`
|
|
||||||
if test "$only_next_1" = "$only_next_2"
|
|
||||||
then
|
|
||||||
not_in_topic=`git rev-list "^$topic" master`
|
|
||||||
if test -z "$not_in_topic"
|
|
||||||
then
|
|
||||||
echo >&2 "$topic is already up to date with master"
|
|
||||||
exit 1 ;# we could allow it, but there is no point.
|
|
||||||
else
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
|
|
||||||
/usr/bin/perl -e '
|
|
||||||
my $topic = $ARGV[0];
|
|
||||||
my $msg = "* $topic has commits already merged to public branch:\n";
|
|
||||||
my (%not_in_next) = map {
|
|
||||||
/^([0-9a-f]+) /;
|
|
||||||
($1 => 1);
|
|
||||||
} split(/\n/, $ARGV[1]);
|
|
||||||
for my $elem (map {
|
|
||||||
/^([0-9a-f]+) (.*)$/;
|
|
||||||
[$1 => $2];
|
|
||||||
} split(/\n/, $ARGV[2])) {
|
|
||||||
if (!exists $not_in_next{$elem->[0]}) {
|
|
||||||
if ($msg) {
|
|
||||||
print STDERR $msg;
|
|
||||||
undef $msg;
|
|
||||||
}
|
|
||||||
print STDERR " $elem->[1]\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
' "$topic" "$not_in_next" "$not_in_master"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
<<\DOC_END
|
|
||||||
|
|
||||||
This sample hook safeguards topic branches that have been
|
|
||||||
published from being rewound.
|
|
||||||
|
|
||||||
The workflow assumed here is:
|
|
||||||
|
|
||||||
* Once a topic branch forks from "master", "master" is never
|
|
||||||
merged into it again (either directly or indirectly).
|
|
||||||
|
|
||||||
* Once a topic branch is fully cooked and merged into "master",
|
|
||||||
it is deleted. If you need to build on top of it to correct
|
|
||||||
earlier mistakes, a new topic branch is created by forking at
|
|
||||||
the tip of the "master". This is not strictly necessary, but
|
|
||||||
it makes it easier to keep your history simple.
|
|
||||||
|
|
||||||
* Whenever you need to test or publish your changes to topic
|
|
||||||
branches, merge them into "next" branch.
|
|
||||||
|
|
||||||
The script, being an example, hardcodes the publish branch name
|
|
||||||
to be "next", but it is trivial to make it configurable via
|
|
||||||
$GIT_DIR/config mechanism.
|
|
||||||
|
|
||||||
With this workflow, you would want to know:
|
|
||||||
|
|
||||||
(1) ... if a topic branch has ever been merged to "next". Young
|
|
||||||
topic branches can have stupid mistakes you would rather
|
|
||||||
clean up before publishing, and things that have not been
|
|
||||||
merged into other branches can be easily rebased without
|
|
||||||
affecting other people. But once it is published, you would
|
|
||||||
not want to rewind it.
|
|
||||||
|
|
||||||
(2) ... if a topic branch has been fully merged to "master".
|
|
||||||
Then you can delete it. More importantly, you should not
|
|
||||||
build on top of it -- other people may already want to
|
|
||||||
change things related to the topic as patches against your
|
|
||||||
"master", so if you need further changes, it is better to
|
|
||||||
fork the topic (perhaps with the same name) afresh from the
|
|
||||||
tip of "master".
|
|
||||||
|
|
||||||
Let's look at this example:
|
|
||||||
|
|
||||||
o---o---o---o---o---o---o---o---o---o "next"
|
|
||||||
/ / / /
|
|
||||||
/ a---a---b A / /
|
|
||||||
/ / / /
|
|
||||||
/ / c---c---c---c B /
|
|
||||||
/ / / \ /
|
|
||||||
/ / / b---b C \ /
|
|
||||||
/ / / / \ /
|
|
||||||
---o---o---o---o---o---o---o---o---o---o---o "master"
|
|
||||||
|
|
||||||
|
|
||||||
A, B and C are topic branches.
|
|
||||||
|
|
||||||
* A has one fix since it was merged up to "next".
|
|
||||||
|
|
||||||
* B has finished. It has been fully merged up to "master" and "next",
|
|
||||||
and is ready to be deleted.
|
|
||||||
|
|
||||||
* C has not merged to "next" at all.
|
|
||||||
|
|
||||||
We would want to allow C to be rebased, refuse A, and encourage
|
|
||||||
B to be deleted.
|
|
||||||
|
|
||||||
To compute (1):
|
|
||||||
|
|
||||||
git rev-list ^master ^topic next
|
|
||||||
git rev-list ^master next
|
|
||||||
|
|
||||||
if these match, topic has not merged in next at all.
|
|
||||||
|
|
||||||
To compute (2):
|
|
||||||
|
|
||||||
git rev-list master..topic
|
|
||||||
|
|
||||||
if this is empty, it is fully merged to "master".
|
|
||||||
|
|
||||||
DOC_END
|
|
@ -1,24 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to make use of push options.
|
|
||||||
# The example simply echoes all push options that start with 'echoback='
|
|
||||||
# and rejects all pushes when the "reject" push option is used.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "pre-receive".
|
|
||||||
|
|
||||||
if test -n "$GIT_PUSH_OPTION_COUNT"
|
|
||||||
then
|
|
||||||
i=0
|
|
||||||
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
|
|
||||||
do
|
|
||||||
eval "value=\$GIT_PUSH_OPTION_$i"
|
|
||||||
case "$value" in
|
|
||||||
echoback=*)
|
|
||||||
echo "echo from the pre-receive-hook: ${value#*=}" >&2
|
|
||||||
;;
|
|
||||||
reject)
|
|
||||||
exit 1
|
|
||||||
esac
|
|
||||||
i=$((i + 1))
|
|
||||||
done
|
|
||||||
fi
|
|
@ -1,42 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to prepare the commit log message.
|
|
||||||
# Called by "git commit" with the name of the file that has the
|
|
||||||
# commit message, followed by the description of the commit
|
|
||||||
# message's source. The hook's purpose is to edit the commit
|
|
||||||
# message file. If the hook fails with a non-zero status,
|
|
||||||
# the commit is aborted.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "prepare-commit-msg".
|
|
||||||
|
|
||||||
# This hook includes three examples. The first one removes the
|
|
||||||
# "# Please enter the commit message..." help message.
|
|
||||||
#
|
|
||||||
# The second includes the output of "git diff --name-status -r"
|
|
||||||
# into the message, just before the "git status" output. It is
|
|
||||||
# commented because it doesn't cope with --amend or with squashed
|
|
||||||
# commits.
|
|
||||||
#
|
|
||||||
# The third example adds a Signed-off-by line to the message, that can
|
|
||||||
# still be edited. This is rarely a good idea.
|
|
||||||
|
|
||||||
COMMIT_MSG_FILE=$1
|
|
||||||
COMMIT_SOURCE=$2
|
|
||||||
SHA1=$3
|
|
||||||
|
|
||||||
/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
|
|
||||||
|
|
||||||
# case "$COMMIT_SOURCE,$SHA1" in
|
|
||||||
# ,|template,)
|
|
||||||
# /usr/bin/perl -i.bak -pe '
|
|
||||||
# print "\n" . `git diff --cached --name-status -r`
|
|
||||||
# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
|
|
||||||
# *) ;;
|
|
||||||
# esac
|
|
||||||
|
|
||||||
# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
|
||||||
# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
|
|
||||||
# if test -z "$COMMIT_SOURCE"
|
|
||||||
# then
|
|
||||||
# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
|
|
||||||
# fi
|
|
@ -1,78 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# An example hook script to update a checked-out tree on a git push.
|
|
||||||
#
|
|
||||||
# This hook is invoked by git-receive-pack(1) when it reacts to git
|
|
||||||
# push and updates reference(s) in its repository, and when the push
|
|
||||||
# tries to update the branch that is currently checked out and the
|
|
||||||
# receive.denyCurrentBranch configuration variable is set to
|
|
||||||
# updateInstead.
|
|
||||||
#
|
|
||||||
# By default, such a push is refused if the working tree and the index
|
|
||||||
# of the remote repository has any difference from the currently
|
|
||||||
# checked out commit; when both the working tree and the index match
|
|
||||||
# the current commit, they are updated to match the newly pushed tip
|
|
||||||
# of the branch. This hook is to be used to override the default
|
|
||||||
# behaviour; however the code below reimplements the default behaviour
|
|
||||||
# as a starting point for convenient modification.
|
|
||||||
#
|
|
||||||
# The hook receives the commit with which the tip of the current
|
|
||||||
# branch is going to be updated:
|
|
||||||
commit=$1
|
|
||||||
|
|
||||||
# It can exit with a non-zero status to refuse the push (when it does
|
|
||||||
# so, it must not modify the index or the working tree).
|
|
||||||
die () {
|
|
||||||
echo >&2 "$*"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Or it can make any necessary changes to the working tree and to the
|
|
||||||
# index to bring them to the desired state when the tip of the current
|
|
||||||
# branch is updated to the new commit, and exit with a zero status.
|
|
||||||
#
|
|
||||||
# For example, the hook can simply run git read-tree -u -m HEAD "$1"
|
|
||||||
# in order to emulate git fetch that is run in the reverse direction
|
|
||||||
# with git push, as the two-tree form of git read-tree -u -m is
|
|
||||||
# essentially the same as git switch or git checkout that switches
|
|
||||||
# branches while keeping the local changes in the working tree that do
|
|
||||||
# not interfere with the difference between the branches.
|
|
||||||
|
|
||||||
# The below is a more-or-less exact translation to shell of the C code
|
|
||||||
# for the default behaviour for git's push-to-checkout hook defined in
|
|
||||||
# the push_to_deploy() function in builtin/receive-pack.c.
|
|
||||||
#
|
|
||||||
# Note that the hook will be executed from the repository directory,
|
|
||||||
# not from the working tree, so if you want to perform operations on
|
|
||||||
# the working tree, you will have to adapt your code accordingly, e.g.
|
|
||||||
# by adding "cd .." or using relative paths.
|
|
||||||
|
|
||||||
if ! git update-index -q --ignore-submodules --refresh
|
|
||||||
then
|
|
||||||
die "Up-to-date check failed"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! git diff-files --quiet --ignore-submodules --
|
|
||||||
then
|
|
||||||
die "Working directory has unstaged changes"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# This is a rough translation of:
|
|
||||||
#
|
|
||||||
# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
|
|
||||||
if git cat-file -e HEAD 2>/dev/null
|
|
||||||
then
|
|
||||||
head=HEAD
|
|
||||||
else
|
|
||||||
head=$(git hash-object -t tree --stdin </dev/null)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! git diff-index --quiet --cached --ignore-submodules $head --
|
|
||||||
then
|
|
||||||
die "Working directory has staged changes"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! git read-tree -u -m "$commit"
|
|
||||||
then
|
|
||||||
die "Could not update working tree to new HEAD"
|
|
||||||
fi
|
|
@ -1,77 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# An example hook script to validate a patch (and/or patch series) before
|
|
||||||
# sending it via email.
|
|
||||||
#
|
|
||||||
# The hook should exit with non-zero status after issuing an appropriate
|
|
||||||
# message if it wants to prevent the email(s) from being sent.
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "sendemail-validate".
|
|
||||||
#
|
|
||||||
# By default, it will only check that the patch(es) can be applied on top of
|
|
||||||
# the default upstream branch without conflicts in a secondary worktree. After
|
|
||||||
# validation (successful or not) of the last patch of a series, the worktree
|
|
||||||
# will be deleted.
|
|
||||||
#
|
|
||||||
# The following config variables can be set to change the default remote and
|
|
||||||
# remote ref that are used to apply the patches against:
|
|
||||||
#
|
|
||||||
# sendemail.validateRemote (default: origin)
|
|
||||||
# sendemail.validateRemoteRef (default: HEAD)
|
|
||||||
#
|
|
||||||
# Replace the TODO placeholders with appropriate checks according to your
|
|
||||||
# needs.
|
|
||||||
|
|
||||||
validate_cover_letter () {
|
|
||||||
file="$1"
|
|
||||||
# TODO: Replace with appropriate checks (e.g. spell checking).
|
|
||||||
true
|
|
||||||
}
|
|
||||||
|
|
||||||
validate_patch () {
|
|
||||||
file="$1"
|
|
||||||
# Ensure that the patch applies without conflicts.
|
|
||||||
git am -3 "$file" || return
|
|
||||||
# TODO: Replace with appropriate checks for this patch
|
|
||||||
# (e.g. checkpatch.pl).
|
|
||||||
true
|
|
||||||
}
|
|
||||||
|
|
||||||
validate_series () {
|
|
||||||
# TODO: Replace with appropriate checks for the whole series
|
|
||||||
# (e.g. quick build, coding style checks, etc.).
|
|
||||||
true
|
|
||||||
}
|
|
||||||
|
|
||||||
# main -------------------------------------------------------------------------
|
|
||||||
|
|
||||||
if test "$GIT_SENDEMAIL_FILE_COUNTER" = 1
|
|
||||||
then
|
|
||||||
remote=$(git config --default origin --get sendemail.validateRemote) &&
|
|
||||||
ref=$(git config --default HEAD --get sendemail.validateRemoteRef) &&
|
|
||||||
worktree=$(mktemp --tmpdir -d sendemail-validate.XXXXXXX) &&
|
|
||||||
git worktree add -fd --checkout "$worktree" "refs/remotes/$remote/$ref" &&
|
|
||||||
git config --replace-all sendemail.validateWorktree "$worktree"
|
|
||||||
else
|
|
||||||
worktree=$(git config --get sendemail.validateWorktree)
|
|
||||||
fi || {
|
|
||||||
echo "sendemail-validate: error: failed to prepare worktree" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
unset GIT_DIR GIT_WORK_TREE
|
|
||||||
cd "$worktree" &&
|
|
||||||
|
|
||||||
if grep -q "^diff --git " "$1"
|
|
||||||
then
|
|
||||||
validate_patch "$1"
|
|
||||||
else
|
|
||||||
validate_cover_letter "$1"
|
|
||||||
fi &&
|
|
||||||
|
|
||||||
if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL"
|
|
||||||
then
|
|
||||||
git config --unset-all sendemail.validateWorktree &&
|
|
||||||
trap 'git worktree remove -ff "$worktree"' EXIT &&
|
|
||||||
validate_series
|
|
||||||
fi
|
|
@ -1,128 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# An example hook script to block unannotated tags from entering.
|
|
||||||
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
|
|
||||||
#
|
|
||||||
# To enable this hook, rename this file to "update".
|
|
||||||
#
|
|
||||||
# Config
|
|
||||||
# ------
|
|
||||||
# hooks.allowunannotated
|
|
||||||
# This boolean sets whether unannotated tags will be allowed into the
|
|
||||||
# repository. By default they won't be.
|
|
||||||
# hooks.allowdeletetag
|
|
||||||
# This boolean sets whether deleting tags will be allowed in the
|
|
||||||
# repository. By default they won't be.
|
|
||||||
# hooks.allowmodifytag
|
|
||||||
# This boolean sets whether a tag may be modified after creation. By default
|
|
||||||
# it won't be.
|
|
||||||
# hooks.allowdeletebranch
|
|
||||||
# This boolean sets whether deleting branches will be allowed in the
|
|
||||||
# repository. By default they won't be.
|
|
||||||
# hooks.denycreatebranch
|
|
||||||
# This boolean sets whether remotely creating branches will be denied
|
|
||||||
# in the repository. By default this is allowed.
|
|
||||||
#
|
|
||||||
|
|
||||||
# --- Command line
|
|
||||||
refname="$1"
|
|
||||||
oldrev="$2"
|
|
||||||
newrev="$3"
|
|
||||||
|
|
||||||
# --- Safety check
|
|
||||||
if [ -z "$GIT_DIR" ]; then
|
|
||||||
echo "Don't run this script from the command line." >&2
|
|
||||||
echo " (if you want, you could supply GIT_DIR then run" >&2
|
|
||||||
echo " $0 <ref> <oldrev> <newrev>)" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
|
|
||||||
echo "usage: $0 <ref> <oldrev> <newrev>" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- Config
|
|
||||||
allowunannotated=$(git config --type=bool hooks.allowunannotated)
|
|
||||||
allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
|
|
||||||
denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
|
|
||||||
allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
|
|
||||||
allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
|
|
||||||
|
|
||||||
# check for no description
|
|
||||||
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
|
|
||||||
case "$projectdesc" in
|
|
||||||
"Unnamed repository"* | "")
|
|
||||||
echo "*** Project description file hasn't been set" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# --- Check types
|
|
||||||
# if $newrev is 0000...0000, it's a commit to delete a ref.
|
|
||||||
zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
|
|
||||||
if [ "$newrev" = "$zero" ]; then
|
|
||||||
newrev_type=delete
|
|
||||||
else
|
|
||||||
newrev_type=$(git cat-file -t $newrev)
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$refname","$newrev_type" in
|
|
||||||
refs/tags/*,commit)
|
|
||||||
# un-annotated tag
|
|
||||||
short_refname=${refname##refs/tags/}
|
|
||||||
if [ "$allowunannotated" != "true" ]; then
|
|
||||||
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
|
|
||||||
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
refs/tags/*,delete)
|
|
||||||
# delete tag
|
|
||||||
if [ "$allowdeletetag" != "true" ]; then
|
|
||||||
echo "*** Deleting a tag is not allowed in this repository" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
refs/tags/*,tag)
|
|
||||||
# annotated tag
|
|
||||||
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
|
|
||||||
then
|
|
||||||
echo "*** Tag '$refname' already exists." >&2
|
|
||||||
echo "*** Modifying a tag is not allowed in this repository." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
refs/heads/*,commit)
|
|
||||||
# branch
|
|
||||||
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
|
|
||||||
echo "*** Creating a branch is not allowed in this repository" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
refs/heads/*,delete)
|
|
||||||
# delete branch
|
|
||||||
if [ "$allowdeletebranch" != "true" ]; then
|
|
||||||
echo "*** Deleting a branch is not allowed in this repository" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
refs/remotes/*,commit)
|
|
||||||
# tracking branch
|
|
||||||
;;
|
|
||||||
refs/remotes/*,delete)
|
|
||||||
# delete tracking branch
|
|
||||||
if [ "$allowdeletebranch" != "true" ]; then
|
|
||||||
echo "*** Deleting a tracking branch is not allowed in this repository" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
# Anything else (is there anything else?)
|
|
||||||
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# --- Finished
|
|
||||||
exit 0
|
|
@ -1,6 +0,0 @@
|
|||||||
# git ls-files --others --exclude-from=.git/info/exclude
|
|
||||||
# Lines that start with '#' are comments.
|
|
||||||
# For a project mostly in C, the following would be a good set of
|
|
||||||
# exclude patterns (uncomment them if you want to use them):
|
|
||||||
# *.[oa]
|
|
||||||
# *~
|
|
@ -1 +0,0 @@
|
|||||||
x}<7D>=oТ0<10>;ћW<D19B>ФРBЈZбЁ<D0B1>АД*j'<27><>э\<5C>ЧgљЃUў}
<0A>fЈТfщ<66>їќМЇ+xz<78>н<EFBFBD>рЃС<D083> =BHЮБ<D0AE>XB<58>lIЖ<49><D096>K4р<34><D180>ћ6QSl<53><6C>УжщеN8=В<>У6<>A<EFBFBD>№<EFBFBD><19>ђ<02>№~ єVЖ(иЁнk6uЄ/NЎ3Ы?Апpф}EУЙ7.*ъщHЙUqжЕїZS(Вe!<21>3]б qш<71>амЖЩRьіЪSYпаZ^IX<49>Ip<49>ЙKqj8Їа<>SYT<59>Яш;aHЁ<48>NvУЮЋ+в{S <09>dГјаm_OШKFњGд
на__<5F>>ЁS<D081>мўћ$9<>3И<33>!8Ж<38>}hШСчf~<7E>nЧ<6E>ьёa<<3C>ѓуqМ? +дє
|
|
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
|||||||
x<01><>Α
|
|
||||||
Β0D=η+φ.”6iΊYΌϋ›dƒΣ”6ω«ώ<C2AB>s<EFBFBD>α1L(9Ο΄±§Ί‰€'<27>‰‘P;ΆaJYΘ"[‰ϊΘδ|ΰΑ'£Vήd©0βδ'<Κdp<64>5…<><17>Φd¬βV<CEB2>eƒΗΚ‹wΈσR\–vαƒ·5wY®0 u#ΦΓΉ?¤Βχd•?η<>‘«ΐή|.±½D½θ#K`
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
|||||||
x}QÉnÂ0í9_ñ”ìHI]. úôŽ88É Ü¦vjO@ñï³Tp©eƳ¼ešÞ7x<37>¾<¨1"Û²šgÙÖXjoô3Ú@ZÕõDóS–)Þ¥ØtÍ}ûöë#ø<>ïoÛÓ5\©8KS´ÚmÈaÑ|
|
|
||||||
ÚãÆÄÅÎýuÛˆŽzbêT‰õèZ¶ÞAs<EFBFBD>C9\½qz*ÃR˜x›t9-Qây5Çdнu\u6š¦§J‚óULˆTIƒÙÇì2<C3AC>É„ÎU¡ßSM-ÜÙó~ 2þ pýH3<áX' Þa¹Ž¨£ìaÚÖ<C39A>ޱö¹u9¶ù½Èü_ä³/·Ðê¾]Œ9@<40>]R3péÄç*H–gz}Ù¦±E µLĬҎò~=¨©¬
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
|||||||
x<01>ŽA‚0E]÷³'!SZ:%1FãÊ<C3A3>wÊI (÷õþÝ[ü¼æi2TÖŸò*V;+5ë¶qd´ÑÁ4<C381>m;$!ô^°F4BjáUR†à‘èÄÅH(\¡íBÝèÈÎ01:£<>7Å{~Í+<‡0<E280A1>¼Á<C2BC>SÞáœ~X†^—©œäšjoÉT„Pà1¾‘Yþ¼+‡>A<ô<>ptoP@¿räÄê
:Mü
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +0,0 @@
|
|||||||
xEŒÁ
|
|
||||||
Â0=ç+ÞQ<C39E>
|
|
||||||
^Û_ˆ¿Ð$[QÂnH¶¡ïÁVOÃ0!KÀùr=$Šyª„yá¨Oa<HïUTnÔ•85HxQÔñø¥…?ÙÍa/9;cöOnŠn¡ïB2ÿvÿ’z‘ªÐÝJP.Q
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +0,0 @@
|
|||||||
x<01>ŽMÂ „]s
|
|
||||||
ö&
ð(?‰1&î½Ã^kc¡MKï/ê
œÝ·˜o&.9O•+p§ºqa êÞi9h‡A‘—É&ʃÐÁ$‰Ê lÅ<6C>JåÒj°ÆH°
|
|
||||||
"Æ Œ÷=yTÁbH®o¢Á†G}.Lq™qçw,õà—òÃ.~ð¶æ.Óµ9Û<0‚ŸE‹ß“•þ¬3œ§±ð´ÄWSLGÚÙSÜK’
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
|||||||
x+)JMU01b040031QÈÌÈ<C38C>OÎÉLÍ+ÑËÉOg<4F>ÝËkžìWùÏÜz_ÍÆ¶š¹gËj‘qf
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
|||||||
x+)JMU0´0g040031Qðñtvõve`íÎöûeïÚ™õlâ§Ð.-©S¬ûöB•¹:ºøºêå¦0þ]#(°{‘Òr±#[³'0ueÍ‹úUìêä Rö×+'xåY©]ç'
|
|
||||||
Å®¶¿g˜¼åˆTYf^Jj…^V1CàÒž}Sm#E6Ò(³ÛôLoQTMAbrvbz*PU~ׯJ×Ú)ຳãÌå.V<>÷ _ºîJ¦
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +0,0 @@
|
|||||||
xUOK
|
|
||||||
В@uЭSЬ№° ZwВИ8KиtR’Tх@ћГ‹9ќ‚bIЮгЅ|О‘П°iv‹ИЦє“R›PкХ:3pЇ GpoҐлI•RЛ]AВжa_Ђз~TќЭнЏIltБ~°yђњ¬НvВl%зАjуЬ§хK8bxїz'‚AQ®дs%Hп—ПK ~хЃ}—…щsbр{
|
|
||||||
6‡:аµNcЊрxЂЙ8»0хBѓUПкWWЛ
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
|||||||
x²▌а
|
|
||||||
б0D=Г+Ж.■4и&+┬чЩ┤M╡еBс√ ┌÷oт?pNС`├≥╢■2V0VЙ&dЫdиq4чЕ⌠ВN┤х( ╪`xrY╜╪и\!└)DЛиMП!╥╒uтБrДfпёБ╫>√
НcZ&~б█Г╨цyЧa≈>x]KWД}@╡зТ▌Ю╗⌡TЗ·╛Рg]и╚бпфy тцСH
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user