mirror of https://github.com/nextcloud/server
Use current git branch by default when setting up cypress container
Signed-off-by: Louis Chemineau <louis@chmn.me>
This commit is contained in:
parent
46dcbd3b77
commit
535c228d57
|
@ -26,6 +26,7 @@
|
||||||
import Docker from 'dockerode'
|
import Docker from 'dockerode'
|
||||||
import waitOn from 'wait-on'
|
import waitOn from 'wait-on'
|
||||||
import tar from 'tar'
|
import tar from 'tar'
|
||||||
|
import { execSync } from 'child_process'
|
||||||
|
|
||||||
export const docker = new Docker()
|
export const docker = new Docker()
|
||||||
|
|
||||||
|
@ -37,7 +38,7 @@ const SERVER_IMAGE = 'ghcr.io/nextcloud/continuous-integration-shallow-server'
|
||||||
*
|
*
|
||||||
* @param {string} branch the branch of your current work
|
* @param {string} branch the branch of your current work
|
||||||
*/
|
*/
|
||||||
export const startNextcloud = async function(branch = 'master'): Promise<any> {
|
export const startNextcloud = async function(branch: string = getCurrentGitBranch()): Promise<any> {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Pulling images
|
// Pulling images
|
||||||
|
@ -245,3 +246,7 @@ const runExec = async function(
|
||||||
const sleep = function(milliseconds: number) {
|
const sleep = function(milliseconds: number) {
|
||||||
return new Promise((resolve) => setTimeout(resolve, milliseconds))
|
return new Promise((resolve) => setTimeout(resolve, milliseconds))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const getCurrentGitBranch = function() {
|
||||||
|
return execSync('git rev-parse --abbrev-ref HEAD').toString().trim() || 'master'
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue