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