rename gitlab jobs and use only one testing job
This commit is contained in:
		@@ -18,12 +18,12 @@ include:
 | 
				
			|||||||
variables:
 | 
					variables:
 | 
				
			||||||
  SAST_DISABLE_DIND: "true"
 | 
					  SAST_DISABLE_DIND: "true"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
prepare:
 | 
					Node_dependencies:
 | 
				
			||||||
  stage: prepare
 | 
					  stage: prepare
 | 
				
			||||||
  script:
 | 
					  script:
 | 
				
			||||||
    - npm install --progress=false
 | 
					    - npm install --progress=false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
build:
 | 
					Minimize:
 | 
				
			||||||
  stage: build
 | 
					  stage: build
 | 
				
			||||||
  script:
 | 
					  script:
 | 
				
			||||||
    - npm run build
 | 
					    - npm run build
 | 
				
			||||||
@@ -33,10 +33,10 @@ build:
 | 
				
			|||||||
      - build/
 | 
					      - build/
 | 
				
			||||||
  needs: ["prepare"]
 | 
					  needs: ["prepare"]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
test:
 | 
					Frontend_Tests:
 | 
				
			||||||
  stage: test
 | 
					  stage: test
 | 
				
			||||||
  script:
 | 
					  script:
 | 
				
			||||||
    - CI=true npm run test
 | 
					    - npm run test
 | 
				
			||||||
  artifacts:
 | 
					  artifacts:
 | 
				
			||||||
    reports:
 | 
					    reports:
 | 
				
			||||||
      junit:
 | 
					      junit:
 | 
				
			||||||
@@ -47,17 +47,7 @@ code_quality:
 | 
				
			|||||||
  tags:
 | 
					  tags:
 | 
				
			||||||
    - dind
 | 
					    - dind
 | 
				
			||||||
 | 
					
 | 
				
			||||||
coverage:
 | 
					Debian_Server:
 | 
				
			||||||
  stage: test
 | 
					 | 
				
			||||||
  script:
 | 
					 | 
				
			||||||
    - CI=true npm run coverage
 | 
					 | 
				
			||||||
  artifacts:
 | 
					 | 
				
			||||||
    reports:
 | 
					 | 
				
			||||||
      cobertura:
 | 
					 | 
				
			||||||
        - ./coverage/cobertura-coverage.xml
 | 
					 | 
				
			||||||
  needs: ["prepare"]
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
package_debian:
 | 
					 | 
				
			||||||
  stage: packaging
 | 
					  stage: packaging
 | 
				
			||||||
  image: debian
 | 
					  image: debian
 | 
				
			||||||
  script:
 | 
					  script:
 | 
				
			||||||
@@ -77,7 +67,7 @@ package_debian:
 | 
				
			|||||||
      - deb/OpenMediaCenter-*.deb
 | 
					      - deb/OpenMediaCenter-*.deb
 | 
				
			||||||
  needs: ["build"]
 | 
					  needs: ["build"]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
electron:
 | 
					Electron_Client:
 | 
				
			||||||
  stage: packaging
 | 
					  stage: packaging
 | 
				
			||||||
  image: electronuserland/builder:wine
 | 
					  image: electronuserland/builder:wine
 | 
				
			||||||
  script:
 | 
					  script:
 | 
				
			||||||
@@ -91,7 +81,7 @@ electron:
 | 
				
			|||||||
      - dist/*.exe
 | 
					      - dist/*.exe
 | 
				
			||||||
  needs: ["build"]
 | 
					  needs: ["build"]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
deploy_test1:
 | 
					Test_Server:
 | 
				
			||||||
  stage: deploy
 | 
					  stage: deploy
 | 
				
			||||||
  image: luki42/alpineopenssh:latest
 | 
					  image: luki42/alpineopenssh:latest
 | 
				
			||||||
  needs:
 | 
					  needs:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,9 +23,7 @@
 | 
				
			|||||||
  "scripts": {
 | 
					  "scripts": {
 | 
				
			||||||
    "start": "react-scripts start",
 | 
					    "start": "react-scripts start",
 | 
				
			||||||
    "build": "react-scripts build",
 | 
					    "build": "react-scripts build",
 | 
				
			||||||
    "test": "react-scripts test --reporters=jest-junit --reporters=default",
 | 
					    "test": "CI=true react-scripts test --reporters=jest-junit --verbose --silent --coverage --reporters=default --colors",
 | 
				
			||||||
    "coverage": "react-scripts test --coverage --watchAll=false",
 | 
					 | 
				
			||||||
    "eject": "react-scripts eject",
 | 
					 | 
				
			||||||
    "buildlinux": "node build.js --linux",
 | 
					    "buildlinux": "node build.js --linux",
 | 
				
			||||||
    "buildwin": "node build.js --win",
 | 
					    "buildwin": "node build.js --win",
 | 
				
			||||||
    "electron-dev": "electron ."
 | 
					    "electron-dev": "electron ."
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user