Jelajahi Sumber

refactor: Updated build-eslint workflow

Owen Diffey 2 tahun lalu
induk
melakukan
b1bd52497d
4 mengubah file dengan 10 tambahan dan 8 penghapusan
  1. 7 5
      .github/workflows/build-eslint.yml
  2. 1 1
      backend/.dockerignore
  3. 1 1
      frontend/.dockerignore
  4. 1 1
      musare.sh

+ 7 - 5
.github/workflows/build-eslint.yml

@@ -4,6 +4,8 @@ on: [ push, pull_request, workflow_dispatch ]
 
 env:
     COMPOSE_PROJECT_NAME: musare
+    RESTART_POLICY: unless-stopped
+    CONTAINER_MODE: prod
     BACKEND_HOST: 127.0.0.1
     BACKEND_PORT: 8080
     FRONTEND_HOST: 127.0.0.1
@@ -28,13 +30,13 @@ jobs:
             - uses: actions/checkout@v2
             - name: Build Musare
               run: |
+                  cp .env.example .env
                   cp backend/config/template.json backend/config/default.json
                   cp frontend/dist/config/template.json frontend/dist/config/default.json
-                  docker-compose build
-                  docker-compose pull
+                  ./musare.sh build
             - name: Start Musare
-              run: docker-compose up -d
+              run: ./musare.sh start
             - name: ESlint Backend
-              run: docker-compose exec -T backend /bin/bash -c "npx eslint app/logic"
+              run: docker-compose exec -T backend npx eslint logic
             - name: ESLint Frontend
-              run: docker-compose exec -T frontend /bin/bash -c "cd app && npm run lint"
+              run: docker-compose exec -T frontend npx eslint src --ext .js,.vue

+ 1 - 1
backend/.dockerignore

@@ -1,2 +1,2 @@
 node_modules/
-Dockerfile
+Dockerfile

+ 1 - 1
frontend/.dockerignore

@@ -1,2 +1,2 @@
 node_modules/
-Dockerfile
+Dockerfile

+ 1 - 1
musare.sh

@@ -210,7 +210,7 @@ if [[ -x "$(command -v docker)" && -x "$(command -v docker-compose)" ]]; then
                 docker-compose exec frontend npx eslint src --ext .js,.vue $fix
                 ;;
             backend)
-                docker-compose exec backend npx eslint app/logic $fix
+                docker-compose exec backend npx eslint logic $fix
                 ;;
             ""|fix|--fix)
                 docker-compose exec frontend npx eslint src --ext .js,.vue $fix