diff --git a/.github/workflows/format-backend.yaml b/.github/workflows/format-backend.yaml index 05105b955..e9fd0c6ba 100644 --- a/.github/workflows/format-backend.yaml +++ b/.github/workflows/format-backend.yaml @@ -2,8 +2,13 @@ name: Python CI on: push: - branches: ['main'] + branches: + - main + - dev pull_request: + branches: + - main + - dev jobs: build: diff --git a/.github/workflows/format-build-frontend.yaml b/.github/workflows/format-build-frontend.yaml index d14aa6aec..121266bf6 100644 --- a/.github/workflows/format-build-frontend.yaml +++ b/.github/workflows/format-build-frontend.yaml @@ -1,25 +1,36 @@ -name: Bun CI +name: Frontend Build + on: push: - branches: ['main'] + branches: + - main + - dev pull_request: + branches: + - main + - dev + jobs: build: name: 'Format & Build Frontend' - env: - PUBLIC_API_BASE_URL: '' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Use Bun - uses: oven-sh/setup-bun@v1 - - run: bun --version - - name: Install frontend dependencies - run: bun install - - name: Format frontend - run: bun run format - - name: Check for changes after format + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v3 + with: + node-version: '20' # Or specify any other version you want to use + + - name: Install Dependencies + run: npm install + + - name: Format Frontend + run: npm run format + + - name: Check for Changes After Format run: git diff --exit-code - - name: Build frontend - if: always() - run: bun run build + + - name: Build Frontend + run: npm run build diff --git a/package.json b/package.json index ace1cb29c..a7d19721a 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,6 @@ "lint:types": "npm run check", "lint:backend": "pylint backend/", "format": "prettier --plugin-search-dir --write '**/*.{js,ts,svelte,css,md,html,json}'", - "format:backend": "yapf --recursive backend -p -i", "i18n:parse": "i18next --config i18next-parser.config.ts && prettier --write 'src/lib/i18n/**/*.{js,json}'" }, "devDependencies": {