requarks / wiki

Wiki.js | A modern and powerful wiki app built on Node.js
https://js.wiki
GNU Affero General Public License v3.0
24.01k stars 2.63k forks source link

git.branch is not working #215

Closed Bamieh closed 6 years ago

Bamieh commented 6 years ago

Actual behavior

in the config.yml adding the following does not do anything

git:
  branch: content

Expected behavior

The wiki to sync with "content" branch

Steps to reproduce the behavior

change git.branch to any branch in the yml file.

The wiki still pushes to master regardless. I tried origin/content aswell, same issue. The branch is created on github already, but it didnt work neither way. I am using ssh to authenticate github

NGPixel commented 6 years ago

Indeed... I'll push a fix in the coming days.

In the meantime, as a workaround, you can set the branch to use by modifying this file: https://github.com/Requarks/wiki/blob/master/server/libs/git.js#L24

Bamieh commented 6 years ago

@NGPixel thanks, but the npm package is still not upto date. I am using docker so i npm install the wiki.

I assume most users do the same, rather than copying the source code

NGPixel commented 6 years ago

@Bamieh Packages are no longer published to npm. See the docs for the new install method. The npm package (wiki.js) is simply calling these scripts from now on.

I changed the CI flow recently and still have a few bug to fixes (hopefully by tomorrow), so your changes won't be included until this is fixed.

If you're using docker, you can use the official image: https://docs.requarks.io/wiki/docker This image already includes your changes.

Bamieh commented 6 years ago

@NGPixel the docker image uses npm install. Can you direct me to the source code of the docker image? The change is still not reflected

NGPixel commented 6 years ago

Are you using the latest docker image?

npm install isn't used in the docker image... If you want to see how the image is built, you can check the wercker.yml file.

Bamieh commented 6 years ago

I see, let me debug further into it then