yerf
/
hakuneko
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[github-pages] updated branch checkout

This commit is contained in:
Ronny Wegener 2020-01-18 10:40:38 +01:00
parent 4106dd5a34
commit ebceb2f864
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy-web.config
View File

@ -2,7 +2,7 @@ module.exports = {
key: 'key.pem',
passphrase: 'env:HAKUNEKO_PASSPHRASE',
build: './build/web',
branch: 'origin/gh-pages',
branch: 'gh-pages',
/**
* Name of the directory within the deployment branch in which the artifacts will be placed
* The deployment directory must match the `applicationStartupURL` configuration in the desktop client

7
deploy-web.js
View File

@ -78,11 +78,12 @@ async function main() {
await fs.move(path.resolve(config.build, meta), path.resolve(config.directory, meta));
await fs.move(path.resolve(config.build, archive), path.resolve(config.directory, archive));
let stashID = await gitStashPush();
await execute(`git fetch origin ${config.branch}`); // await execute(`git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +gh-pages:refs/remotes/origin/gh-pages`);
await execute(`git checkout ${config.branch}`); // await execute(`git checkout --progress --force -B gh-pages refs/remotes/origin/gh-pages`);
await execute(`cat .git/config`); // DEBUG
await execute(`git branch`); // DEBUG
await execute(`cat .git/config`);
await execute(`git branch`);
//await execute(`git fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 ${config.branch}`);
await execute(`git checkout --track ${config.branch}`);
// /usr/bin/git checkout --progress --force -B master refs/remotes/origin/master
await execute(`git rm -r ${config.directory} || true`);
await gitStashPop(stashID);
await gitCommit();