diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a994f01cd..2978a4622 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,15 +30,4 @@ jobs: run: cd townService; npm install && npm run prestart && npm run lint && npm test - name: Build and test frontend components - run: cd frontend; npm install && npm run prestart && npm run lint && npm test -# deploy: -# if: github.ref == 'refs/heads/master' -# needs: build-and-test -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v3 -# - uses: akhileshns/heroku-deploy@v3.12.12 # Deploy to Heroku action -# with: -# heroku_api_key: ${{secrets.HEROKU_API_KEY}} -# heroku_app_name: ${{secrets.HEROKU_APP_NAME}} -# heroku_email: ${{secrets.HEROKU_EMAIL}} + run: cd frontend; npm install && npm run prestart && npm run lint && npm test \ No newline at end of file diff --git a/package.json b/package.json index 044b1d0f9..0816bea8d 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "Development setup", "main": "index.js", "scripts": { - "install": "cd townService && npm install && npm run prestart && cd ../frontend && npm install && npm run prestart && cd ../shared && npm install", - "heroku-postbuild": "cd townService && npm install && npm run build", + "install": "cd townService && npm install && npm run prestart && cd ../shared && npm install", + "heroku-postbuild": "cd townService && CI=false NODE_ENV=development npm install && npm run build", "run-townservice": "heroku local -p 3001 web", "lint": "cd townService && npm run-script lint && cd ../frontend && npm run-script lint && cd ../shared && npm run-script lint", "zip": "npm-pack-zip"