diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index e6d7584c..0730ff24 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -4,30 +4,45 @@ on: pull_request: workflow_dispatch: push: - branches: [ main ] + branches: [ main, develop ] jobs: - linters: - name: Semantic Commits + + commit-lint: + name: 'Semantic Commits' runs-on: ubuntu-latest if: github.event_name == 'pull_request' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + with: + fetch-depth: 200 + - uses: actions/setup-node@v4 + with: + node-version: 18 + check-latest: true - - name: Set up Python - uses: actions/setup-python@v4 + - name: Check commit titles + run: | + npm install @commitlint/cli @commitlint/config-conventional + npx commitlint --verbose --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }} + + linters: + name: Semgrep Rules + runs-on: ubuntu-latest + if: github.event_name == 'pull_request' + + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: '3.10' - - - name: Install and Run Pre-commit - uses: pre-commit/action@v2.0.3 + cache: pip - name: Download Semgrep rules run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules - - name: Download semgrep - run: pip install semgrep - - name: Run Semgrep rules - run: semgrep ci --config ./frappe-semgrep-rules/rules + run: | + pip install semgrep + semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness diff --git a/frappe-ui b/frappe-ui index c5faaae3..5c0513c2 160000 --- a/frappe-ui +++ b/frappe-ui @@ -1 +1 @@ -Subproject commit c5faaae38ec6314879aa0abf3a3f992cb6f2240b +Subproject commit 5c0513c2df9ec66f7b33d34e21f466d195297df1 diff --git a/frontend/package.json b/frontend/package.json index 6489fd75..d36fa4d7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -21,7 +21,7 @@ "chart.js": "^4.4.1", "dayjs": "^1.11.6", "feather-icons": "^4.28.0", - "frappe-ui": "^0.1.50", + "frappe-ui": "^0.1.54", "lucide-vue-next": "^0.309.0", "markdown-it": "^14.0.0", "pinia": "^2.0.33", diff --git a/frontend/src/components/BatchCourses.vue b/frontend/src/components/BatchCourses.vue index 241c5ae9..7d644eb8 100644 --- a/frontend/src/components/BatchCourses.vue +++ b/frontend/src/components/BatchCourses.vue @@ -19,7 +19,7 @@