Compare commits

...

18 commits

Author SHA1 Message Date
97b85f4bd9 Merge branch 'gob.mx/centos-9' into 'master'
gob.mx 1.4 para Libreoffice 24.2.5

See merge request strepsirrhini/libreoffice-compilar!13
2024-08-03 00:49:59 +00:00
281457d9c9 Merge branch 'Sandino/gob.mx-1.3-24.2.4.2-el9' into 'master'
gob.mx 1.3 para Libreoffice 24.2.4.2 para CentOS 9

See merge request strepsirrhini/libreoffice-compilar!12
2024-07-09 00:17:06 +00:00
816ed9aca5
merge gob.mx-1.3-24.2.4.2-el9 2024-06-28 23:47:35 -06:00
4a23dbac89 Código merge de upstream a strep 2024-06-19 03:14:35 +00:00
b4dea4ed66 Merge branch 'sandino/gob.mx-24.2.1.2-el9' into 'master'
Sandino/gob.mx 24.2.1.2 el9

See merge request strepsirrhini/libreoffice-compilar!11
2024-04-13 11:27:31 +00:00
Sandino Araico Sánchez
8a31275554 Merge pull request 'sandino/gob.mx-24.2.1.2-el9' (#8) from sandino/gob.mx-24.2.1.2-el9 into master
Reviewed-on: https://git.ugd.gob.mx/Strepsirrhini/libreoffice-compiling/pulls/8
2024-04-13 11:25:32 +00:00
a6daacf79b merge master 2024-04-13 05:23:51 -06:00
25843d8eaf Merge branch 'Sandino/rpmbuild-la-tercera-es-la-vencida' into 'master'
Directorio rpmbuild para evitarnos ambigüedades con CentOS

See merge request strepsirrhini/libreoffice-compilar!10
2024-04-13 10:20:00 +00:00
73ce9de293 Directorio rpmbuild para evitarnos ambigüedades con CentOS 2024-04-10 04:04:50 -06:00
dde9a88fc9 Merge branch 'gob.mx-24.2.0.2-el9' into 'master'
gob.mx-24.2.0.2

See merge request strepsirrhini/libreoffice-compilar!6
2024-04-09 02:06:15 +00:00
9c7cd9f562 Una prueba unitaria que falló en 24.2.1.2 2024-04-08 19:57:21 -06:00
cf5a2151e6 Parches gob.mx ya vienen incluídos en los paquetes tar.xz 2024-04-04 16:17:36 -06:00
e608e1738d merge gob.mx/24.2.1.2-fc39 2024-04-04 16:11:55 -06:00
d0c53911a7 merge 24.2.1.2-fc39 2024-04-03 13:19:15 -06:00
d66980390b Uso de macro %{gobmx_version} en la versión del paquete 2024-04-02 21:02:11 -06:00
6cd518cf4f Llave correcta para paquetes de gob.mx y parches comentados 2024-04-02 20:44:36 -06:00
483fecd1ff Merge branch 'gob.mx/24.2.1.2-fc40' into sandino/24.2.1.2-gob.mx 2024-04-02 20:37:21 -06:00
2754182d7f Uso de nuestros paquetes tar.gz en vez de los de TDF 2024-04-02 19:25:13 -06:00
3 changed files with 31 additions and 0 deletions

1
CentOS-9 Symbolic link
View file

@ -0,0 +1 @@
rpmbuild

30
scripts/weekly-update.sh Normal file
View file

@ -0,0 +1,30 @@
#Es necesario agregar el remoto de core
#git remote add upstream https://git.libreoffice.org/core
set -x
pushd night-v2-updates
git fetch --all --tags
git merge --abort
git reset --hard
git clean -df
git checkout -q -f origin/master
git fetch upstream master
DATE="$(date +%Y-%m-%d)"
git branch -D actualizacion-master-"$DATE"
git checkout -b actualizacion-master-"$DATE"
git merge --no-commit upstream/master
if [ "$?" -eq "0" ]; then
#hacer push de rama
git commit -a -m "actualizacion automatica $DATE"
git push origin actualizacion-master-"$DATE"
else
#enviar mensaje de log de error
echo "ERR_BOT: No actualizO repositorio"
fi
popd