Explorar el Código

Bump gnusocial and pleroma commits

Bob Mottram hace 7 años
padre
commit
74bc296552
Se han modificado 2 ficheros con 4 adiciones y 2 borrados
  1. 1
    1
      src/freedombone-app-gnusocial
  2. 3
    1
      src/freedombone-utils-gnusocialtools

+ 1
- 1
src/freedombone-app-gnusocial Ver fichero

@@ -37,7 +37,7 @@ GNUSOCIAL_DOMAIN_NAME=
37 37
 GNUSOCIAL_CODE=
38 38
 GNUSOCIAL_ONION_PORT=8087
39 39
 GNUSOCIAL_REPO="https://git.gnu.io/gnu/gnu-social.git"
40
-GNUSOCIAL_COMMIT='05a9c11c476b384e5ef3f3cc83b66406fcf7a378'
40
+GNUSOCIAL_COMMIT='d61375cb7fd9e3ac2dbba2b22d0d6461fb753892'
41 41
 GNUSOCIAL_ADMIN_PASSWORD=
42 42
 
43 43
 GNUSOCIAL_BACKGROUND_IMAGE_URL=

+ 3
- 1
src/freedombone-utils-gnusocialtools Ver fichero

@@ -33,7 +33,7 @@ QVITTER_THEME_REPO="https://git.postactiv.com/bob/Qvitter"
33 33
 QVITTER_THEME_COMMIT='b5791cf935a6391c492cefa1ffa50cc3cea44c12'
34 34
 
35 35
 PLEROMA_REPO="https://gitgud.io/lambadalambda/pleroma-fe"
36
-PLEROMA_COMMIT='7d59051fc5e93585d8d9858ac989d9ebf7aa3cf9'
36
+PLEROMA_COMMIT='cbe652f2d94d81fa54a37378b7ff014c4391ca5e'
37 37
 
38 38
 ARMADILLO_REPO="https://git.postactiv.com/maiya/Armadillo"
39 39
 ARMADILLO_COMMIT='ec3938a678f373156c4cbf37926c9a5ab68222c4'
@@ -409,6 +409,7 @@ function install_pleroma_front_end {
409 409
     npm install -g eslint-plugin-promise@3.5.0
410 410
     npm install -g moment@2.18.1
411 411
     npm install -g node-sass@4.5.2
412
+    npm install -g whatwg-fetch@2.0.3
412 413
     yarn
413 414
     if [ -f $INSTALL_DIR/pleroma/dist/index.html ]; then
414 415
         rm -rf $INSTALL_DIR/pleroma/dist/*
@@ -452,6 +453,7 @@ function upgrade_pleroma {
452 453
     if [ -d $INSTALL_DIR/pleroma ]; then
453 454
         set_repo_commit $INSTALL_DIR/pleroma "${app_name} pleroma commit" "$PLEROMA_COMMIT" $PLEROMA_REPO
454 455
         cd $INSTALL_DIR/pleroma
456
+        yarn
455 457
         npm run build
456 458
         if [ ! -d $INSTALL_DIR/pleroma/dist ]; then
457 459
             echo 'Unable to build pleroma'