Merge branch 'unstable' into issue_4416

Author: KshitijThareja

.github/pull_request_template.md

@@ -0,0 +1,12 @@
+name: Community Contribution Label
+
+on:
+  issues:
+    types: [assigned, unassigned]
+
+jobs:
+  call-label-action:
+    uses: learningequality/.github/.github/workflows/community-contribution-label.yml@main
+    secrets:
+        LE_BOT_APP_ID: ${{ secrets.LE_BOT_APP_ID }}
+        LE_BOT_PRIVATE_KEY: ${{ secrets.LE_BOT_PRIVATE_KEY }}

.github/workflows/community-contribution-labeling.yml

@@ -57,7 +57,7 @@ jobs:
         DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
 
     - name: Build and push Docker image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: ./docker
         file: ./docker/Dockerfile.postgres.dev
@@ -97,7 +97,7 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Build Docker image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: ./
         file: ./k8s/images/nginx/Dockerfile

.github/workflows/containerbuild.yml

@@ -45,21 +45,6 @@ jobs:
         npm rebuild node-sass
     - name: Run tests
       run: yarn run lint-frontend:format
-    - name: Check for modified files
-      if: github.event.pull_request && github.event.pull_request.head.repo.full_name == github.repository
-      id: git-check
-      run: echo ::set-output name=modified::$(git diff-index --name-only HEAD)
-    - uses: tibdex/github-app-token@v2
-      if: github.event.pull_request && github.event.pull_request.head.repo.full_name == github.repository && steps.git-check.outputs.modified != ''
-      id: generate-token
-      with:
-        app_id: ${{ secrets.CODE_FIX_APP_ID }}
-        private_key: ${{ secrets.CODE_FIX_APP_PRIVATE_KEY }}
-    - name: Push changes
-      if: github.event.pull_request && github.event.pull_request.head.repo.full_name == github.repository && steps.git-check.outputs.modified != ''
-      run: |
-        git config --global user.name 'Learning Equality'
-        git config --global user.email '[email protected]'
-        git remote set-url origin https://x-access-token:${{ steps.generate-token.outputs.token }}@github.com/${{ github.repository }}
-        git commit -am "Frontend linting of ${{ steps.git-check.outputs.modified }}"
-        git push
+    - name: Run pre-commit-ci-lite
+      uses: pre-commit-ci/[email protected]
+      if: always()

.github/workflows/frontendlint.yml

@@ -6,30 +6,6 @@ on:
 
 jobs:
   contributor_issue_comment:
-    name: Contributor issue comment
-
-    if: >-
-      ${{
-        !github.event.issue.pull_request &&
-        github.event.comment.author_association != 'MEMBER' &&
-        github.event.comment.author_association != 'OWNER'
-      }}
-
-    runs-on: ubuntu-latest
-    steps:
-      - name: Escape title double quotes
-        id: escape_title
-        env:
-          ISSUE_TITLE: ${{ github.event.issue.title }}
-        run: echo "ISSUE_TITLE=${ISSUE_TITLE//\"/\\\"}" >> "$GITHUB_OUTPUT"
-
-      - name: Send message to Slack channel
-        env:
-            SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-            SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-        uses: slackapi/[email protected]
-        with:
-          payload: |
-            {
-              "text": "*[Studio] New comment on issue: <${{ github.event.issue.html_url }}#issuecomment-${{ github.event.comment.id }}|${{ steps.escape_title.outputs.ISSUE_TITLE }} by ${{ github.event.comment.user.login }}>*"
-            }
+    uses: learningequality/.github/.github/workflows/notify_team_new_comment.yml@main
+    secrets:
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/notify_team_new_comment.yml

@@ -32,7 +32,7 @@ jobs:
       # Label used to access the service container
       postgres:
         # Docker Hub image
-        image: postgres:12
+        image: postgres:16
         # Provide the password for postgres
         env:
           POSTGRES_USER: learningequality
@@ -65,11 +65,10 @@ jobs:
     - name: Set up minio
       run: |
         docker run -d -p 9000:9000 --name minio \
-                    -e "MINIO_ACCESS_KEY=development" \
-                    -e "MINIO_SECRET_KEY=development" \
-                    -v /tmp/minio_data:/data \
-                    -v /tmp/minio_config:/root/.minio \
-                    minio/minio server /data
+                    -e "MINIO_ROOT_USER=development" \
+                    -e "MINIO_ROOT_PASSWORD=development" \
+                    -e "MINIO_DEFAULT_BUCKETS=content:public" \
+                    bitnami/minio:2024.5.28
     - name: Set up Python 3.10
       uses: actions/setup-python@v5
       with:

.github/workflows/pythontest.yml

@@ -0,0 +1,12 @@
+name: Update community pull requests spreadsheet
+on:
+  pull_request_target:
+    types: [assigned,unassigned,opened,closed,reopened]
+
+jobs:
+  call-update-spreadsheet:
+    uses: learningequality/.github/.github/workflows/update-pr-spreadsheet.yml@main
+    secrets:
+      CONTRIBUTIONS_SPREADSHEET_ID: ${{ secrets.CONTRIBUTIONS_SPREADSHEET_ID }}
+      CONTRIBUTIONS_SHEET_NAME: ${{ secrets.CONTRIBUTIONS_SHEET_NAME }}
+      GH_UPLOADER_GCP_SA_CREDENTIALS: ${{ secrets.GH_UPLOADER_GCP_SA_CREDENTIALS }}

.github/workflows/update-pr-spreadsheet.yml

@@ -27,8 +27,8 @@ var/
 .vscode/
 
 # IntelliJ IDE, except project config
-.idea/*
-!.idea/studio.iml
+.idea/
+/*.iml
 # ignore future updates to run configuration
 .run/devserver.run.xml
 

.gitignore

@@ -22,4 +22,4 @@ repos:
           description: This hook handles all frontend linting for Kolibri Studio
           entry: yarn run lint-frontend:format
           language: system
-          files: \.(js|vue|scss|less|css)$
+          files: \.(js|vue|scss|css)$