New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

git.branch is not working #215

Closed
Bamieh opened this Issue Aug 20, 2017 · 6 comments

Comments

2 participants
@Bamieh
Copy link
Contributor

Bamieh commented Aug 20, 2017

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 NGPixel self-assigned this Aug 23, 2017

@NGPixel NGPixel added the bug label Aug 23, 2017

@NGPixel

This comment has been minimized.

Copy link
Member

NGPixel commented Aug 23, 2017

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

This comment has been minimized.

Copy link
Contributor

Bamieh commented Aug 27, 2017

@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

This comment has been minimized.

Copy link
Member

NGPixel commented Aug 27, 2017

@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

This comment has been minimized.

Copy link
Contributor

Bamieh commented Aug 30, 2017

@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

This comment has been minimized.

Copy link
Member

NGPixel commented Aug 30, 2017

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

This comment has been minimized.

Copy link
Contributor

Bamieh commented Aug 30, 2017

I see, let me debug further into it then

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment