Compiler24 » Historique » Version 31
Emmanuel GARETTE, 26/05/2017 14:05
| 1 | 1 | Emmanuel GARETTE | h1. Compiler24 |
|---|---|---|---|
| 2 | 1 | Emmanuel GARETTE | |
| 3 | 22 | Emmanuel GARETTE | h2. Ajout des dépôts : |
| 4 | 1 | Emmanuel GARETTE | |
| 5 | 28 | Lionel Morin | Ajouter (si ce n'est pas fait) le dépôt officiel de tiramisu (se placer dans le dépot tiramisu d'EOLE); |
| 6 | 1 | Emmanuel GARETTE | |
| 7 | 22 | Emmanuel GARETTE | <pre> |
| 8 | 22 | Emmanuel GARETTE | git remote add lab git://git.labs.libre-entreprise.org/tiramisu.git |
| 9 | 22 | Emmanuel GARETTE | </pre> |
| 10 | 1 | Emmanuel GARETTE | |
| 11 | 22 | Emmanuel GARETTE | h2. Configuration des variables |
| 12 | 1 | Emmanuel GARETTE | |
| 13 | 22 | Emmanuel GARETTE | h3. sur 2.4 |
| 14 | 1 | Emmanuel GARETTE | |
| 15 | 22 | Emmanuel GARETTE | <pre> |
| 16 | 22 | Emmanuel GARETTE | BRANCHE_TIRAMISU=lab/1.0 |
| 17 | 22 | Emmanuel GARETTE | BRANCHE_EOLE=1.0/master |
| 18 | 22 | Emmanuel GARETTE | DEPOT=eole-2.4-unstable |
| 19 | 22 | Emmanuel GARETTE | BRANCHE_PACKAGE=dist/ubuntu/precise/master |
| 20 | 22 | Emmanuel GARETTE | </pre> |
| 21 | 1 | Emmanuel GARETTE | |
| 22 | 22 | Emmanuel GARETTE | h3. sur 2.5 |
| 23 | 1 | Emmanuel GARETTE | |
| 24 | 22 | Emmanuel GARETTE | <pre> |
| 25 | 22 | Emmanuel GARETTE | BRANCHE_TIRAMISU=lab/1.0 |
| 26 | 22 | Emmanuel GARETTE | BRANCHE_EOLE=1.0/master |
| 27 | 22 | Emmanuel GARETTE | DEPOT=eole-2.5-unstable |
| 28 | 22 | Emmanuel GARETTE | BRANCHE_PACKAGE=dist/eole/2.5/master |
| 29 | 22 | Emmanuel GARETTE | </pre> |
| 30 | 1 | Emmanuel GARETTE | |
| 31 | 22 | Emmanuel GARETTE | h3. sur 2.6.0 |
| 32 | 1 | Emmanuel GARETTE | |
| 33 | 22 | Emmanuel GARETTE | <pre> |
| 34 | 22 | Emmanuel GARETTE | BRANCHE_TIRAMISU=lab/2.0 |
| 35 | 22 | Emmanuel GARETTE | BRANCHE_EOLE=2.6.0/master |
| 36 | 22 | Emmanuel GARETTE | DEPOT=eole-2.6.0/proposed-updates |
| 37 | 25 | Emmanuel GARETTE | BRANCHE_PACKAGE=dist/eole/2.6.0/master |
| 38 | 22 | Emmanuel GARETTE | </pre> |
| 39 | 1 | Emmanuel GARETTE | |
| 40 | 22 | Emmanuel GARETTE | h3. sur 2.6.1 |
| 41 | 1 | Emmanuel GARETTE | |
| 42 | 22 | Emmanuel GARETTE | <pre> |
| 43 | 27 | Emmanuel GARETTE | BRANCHE_TIRAMISU=lab/master |
| 44 | 30 | Emmanuel GARETTE | BRANCHE_EOLE=2.6.0/master |
| 45 | 31 | Emmanuel GARETTE | DEPOT=eole-2.6.1/proposed-updates |
| 46 | 25 | Emmanuel GARETTE | BRANCHE_PACKAGE=dist/eole/2.6.1/master |
| 47 | 22 | Emmanuel GARETTE | </pre> |
| 48 | 1 | Emmanuel GARETTE | |
| 49 | 30 | Emmanuel GARETTE | h3. sur 2.6.2 |
| 50 | 30 | Emmanuel GARETTE | |
| 51 | 30 | Emmanuel GARETTE | <pre> |
| 52 | 30 | Emmanuel GARETTE | BRANCHE_TIRAMISU=lab/master |
| 53 | 30 | Emmanuel GARETTE | BRANCHE_EOLE=master |
| 54 | 30 | Emmanuel GARETTE | DEPOT=eole-2.6/unstable |
| 55 | 30 | Emmanuel GARETTE | BRANCHE_PACKAGE=dist/eole/2.6.2/master |
| 56 | 30 | Emmanuel GARETTE | </pre> |
| 57 | 22 | Emmanuel GARETTE | h2. Récupération des nouveaux commits : |
| 58 | 1 | Emmanuel GARETTE | |
| 59 | 22 | Emmanuel GARETTE | Faire la différence entre local et distant : |
| 60 | 1 | Emmanuel GARETTE | |
| 61 | 22 | Emmanuel GARETTE | <pre> |
| 62 | 22 | Emmanuel GARETTE | git fetch lab |
| 63 | 22 | Emmanuel GARETTE | git checkout $BRANCHE_EOLE |
| 64 | 22 | Emmanuel GARETTE | git pull |
| 65 | 22 | Emmanuel GARETTE | </pre> |
| 66 | 11 | Emmanuel GARETTE | |
| 67 | 22 | Emmanuel GARETTE | h2. Merge des branches |
| 68 | 22 | Emmanuel GARETTE | |
| 69 | 22 | Emmanuel GARETTE | <pre> |
| 70 | 22 | Emmanuel GARETTE | git checkout $BRANCHE_EOLE |
| 71 | 22 | Emmanuel GARETTE | git merge $BRANCHE_TIRAMISU $BRANCHE_EOLE |
| 72 | 22 | Emmanuel GARETTE | git push |
| 73 | 22 | Emmanuel GARETTE | </pre> |
| 74 | 22 | Emmanuel GARETTE | |
| 75 | 22 | Emmanuel GARETTE | h2. Création du paquet : |
| 76 | 22 | Emmanuel GARETTE | |
| 77 | 29 | Lionel Morin | Pour retrouver le dernier tag utilisé : @git describe@ |
| 78 | 29 | Lionel Morin | et ajouter 1 au dernier chiffre pour avoir le nouveau. |
| 79 | 29 | Lionel Morin | |
| 80 | 22 | Emmanuel GARETTE | <pre> |
| 81 | 26 | Emmanuel GARETTE | TAG=XXXX |
| 82 | 26 | Emmanuel GARETTE | git tag -m"version $TAG" release/$TAG |
| 83 | 26 | Emmanuel GARETTE | git push origin release/$TAG |
| 84 | 22 | Emmanuel GARETTE | </pre> |
| 85 | 22 | Emmanuel GARETTE | |
| 86 | 22 | Emmanuel GARETTE | <pre> |
| 87 | 22 | Emmanuel GARETTE | git package $BRANCHE_PACKAGE |
| 88 | 22 | Emmanuel GARETTE | git package -b -d $DEPOT $BRANCHE_PACKAGE |
| 89 | 22 | Emmanuel GARETTE | </pre> |
| 90 | 22 | Emmanuel GARETTE | |
| 91 | 1 | Emmanuel GARETTE | *Attention* il faut sûrement faire un paquet tiramisu1 en 2.6 (pour Zéphir) : |
| 92 | 1 | Emmanuel GARETTE | |
| 93 | 23 | Emmanuel GARETTE | <pre> |
| 94 | 23 | Emmanuel GARETTE | git package dist/eole/2.6.0/tiramisu1 |
| 95 | 23 | Emmanuel GARETTE | git package -b -d eole-2.6/unstable 2.6.0/tiramisu1 |
| 96 | 23 | Emmanuel GARETTE | </pre> |