Merge tag 'fixed_gitlab_ci_v2' into develop
v.1.26.13
This commit is contained in:
@@ -5,10 +5,21 @@ cache:
|
||||
- node_modules
|
||||
|
||||
stages:
|
||||
- lint
|
||||
- test
|
||||
- test:build
|
||||
- deploy
|
||||
|
||||
merge:test:lint:
|
||||
stage: lint
|
||||
script:
|
||||
- npm install
|
||||
- cp example.env.local .env.local
|
||||
- cp example.env.local .env.test
|
||||
- npm run lint
|
||||
only:
|
||||
- merge_requests
|
||||
|
||||
merge:test:jest:
|
||||
stage: test
|
||||
script:
|
||||
@@ -19,16 +30,6 @@ merge:test:jest:
|
||||
only:
|
||||
- merge_requests
|
||||
|
||||
merge:test:lint:
|
||||
stage: test
|
||||
script:
|
||||
- npm install
|
||||
- cp example.env.local .env.local
|
||||
- cp example.env.local .env.test
|
||||
- npm run lint
|
||||
only:
|
||||
- merge_requests
|
||||
|
||||
#merge:test:build:
|
||||
# stage: test:build
|
||||
# script:
|
||||
@@ -39,6 +40,17 @@ merge:test:lint:
|
||||
# only:
|
||||
# - merge_requests
|
||||
|
||||
test:lint:
|
||||
stage: lint
|
||||
script:
|
||||
- npm install
|
||||
- cp example.env.local .env.local
|
||||
- cp example.env.local .env.test
|
||||
- npm run lint
|
||||
only:
|
||||
- develop
|
||||
- main
|
||||
|
||||
test:jest:
|
||||
stage: test
|
||||
script:
|
||||
@@ -50,17 +62,6 @@ test:jest:
|
||||
- develop
|
||||
- main
|
||||
|
||||
test:lint:
|
||||
stage: test
|
||||
script:
|
||||
- npm install
|
||||
- cp example.env.local .env.local
|
||||
- cp example.env.local .env.test
|
||||
- npm run lint
|
||||
only:
|
||||
- develop
|
||||
- main
|
||||
|
||||
#test:build:
|
||||
# stage: test:build
|
||||
# script:
|
||||
|
||||
@@ -11,7 +11,6 @@ const NetworkComponent = () => {
|
||||
const t = useTranslations()
|
||||
|
||||
useEffect(() => {
|
||||
console.log(network.online)
|
||||
if (network.online) {
|
||||
toast.update(networkToastId.current, {
|
||||
type: toast.TYPE.SUCCESS,
|
||||
|
||||
Reference in New Issue
Block a user