diff --git a/.eslintrc b/.eslintrc index 6c7bbbd..e857efc 100644 --- a/.eslintrc +++ b/.eslintrc @@ -42,6 +42,8 @@ "tailwindcss/classnames-order": "warn", "tailwindcss/no-custom-classname": "warn", "tailwindcss/no-contradicting-classname": "error", - "@typescript-eslint/ban-types": "off" + "@typescript-eslint/ban-types": "off", + "@typescript-eslint/ban-ts-comment": "off", + "@typescript-eslint/no-explicit-any": "off" } } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a848dcf..33a1482 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,15 +3,14 @@ name: CI on: push: branches: - - main # or the branch you want to trigger the workflow on + - main pull_request: branches: - main jobs: - build-and-deploy: + build-and-test: runs-on: ubuntu-latest - steps: - name: Checkout code uses: actions/checkout@v3 @@ -19,7 +18,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v3 with: - node-version: '18' # Specify the Node.js version you want to use + node-version: '18' - name: Install dependencies run: npm install @@ -30,6 +29,25 @@ jobs: - name: Build project run: npm run build + deploy: + if: github.ref == 'refs/heads/main' + needs: build-and-test + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + node-version: '18' + + - name: Install dependencies + run: npm install + + - name: Build project + run: npm run build + - name: Deploy to Netlify uses: nwtgck/actions-netlify@v1.2 with: @@ -42,4 +60,4 @@ jobs: env: NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }} - timeout-minutes: 1 + timeout-minutes: 20 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3e7d00d..142bd3f 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,12 +4,10 @@