Merge pull request #5657 from MisRob/channel-cards

Unstable to channel cards branch

Author: MisRob

.github/dependabot.yml

@@ -7,17 +7,19 @@ updates:
   - package-ecosystem: "pip"
     directory: "/"
     schedule:
-      interval: "weekly"
-      day: "wednesday"
+      interval: "monthly"
       time: "00:00"
+    cooldown:
+      default-days: 7
 
   # Maintain dependencies for Javascript
   - package-ecosystem: "npm"
     directory: "/"
     schedule:
-      interval: "weekly"
-      day: "wednesday"
+      interval: "monthly"
       time: "00:00"
+    cooldown:
+      default-days: 7
     groups:
       babel:
         patterns:
@@ -33,9 +35,10 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
-      day: "wednesday"
+      interval: "monthly"
       time: "00:00"
+    cooldown:
+      default-days: 7
     groups:
       github:
         patterns:

.github/workflows/call-contributor-pr-reply.yml

@@ -0,0 +1,12 @@
+name: Send reply on a new contributor pull request
+on:
+  pull_request_target:
+    types: [opened]
+jobs:
+  call-workflow:
+    name: Call shared workflow
+    uses: learningequality/.github/.github/workflows/contributor-pr-reply.yml@main
+    secrets:
+      LE_BOT_APP_ID: ${{ secrets.LE_BOT_APP_ID }}
+      LE_BOT_PRIVATE_KEY: ${{ secrets.LE_BOT_PRIVATE_KEY }}
+      SLACK_COMMUNITY_NOTIFICATIONS_WEBHOOK_URL: ${{ secrets.SLACK_COMMUNITY_NOTIFICATIONS_WEBHOOK_URL }}

…thub/workflows/update-pr-spreadsheet.yml …workflows/call-update-pr-spreadsheet.yml.github/workflows/update-pr-spreadsheet.yml renamed to .github/workflows/call-update-pr-spreadsheet.yml .github/workflows/update-pr-spreadsheet.yml renamed to .github/workflows/call-update-pr-spreadsheet.yml

@@ -1,12 +1,15 @@
 name: Update community pull requests spreadsheet
 on:
   pull_request_target:
-    types: [assigned,unassigned,opened,closed,reopened]
+    types: [assigned, unassigned, opened, closed, reopened, edited, review_requested, review_request_removed]
 
 jobs:
-  call-update-spreadsheet:
+  call-workflow:
+    name: Call shared workflow
     uses: learningequality/.github/.github/workflows/update-pr-spreadsheet.yml@main
     secrets:
+      LE_BOT_APP_ID: ${{ secrets.LE_BOT_APP_ID }}
+      LE_BOT_PRIVATE_KEY: ${{ secrets.LE_BOT_PRIVATE_KEY }}
       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/containerbuild.yml

@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout codebase
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
@@ -79,7 +79,7 @@ jobs:
         with:
           skip_after_successful_duplicate: false
           github_token: ${{ github.token }}
-          paths: '["k8s/images/nginx/*", ".github/workflows/containerbuild.yml"]'
+          paths: '["docker/Dockerfile.nginx.prod", "docker/nginx/*", ".github/workflows/containerbuild.yml"]'
 
   build_nginx:
     name: nginx - test build of nginx Docker image
@@ -88,7 +88,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout codebase
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
@@ -100,6 +100,6 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         context: ./
-        file: ./k8s/images/nginx/Dockerfile
+        file: ./docker/Dockerfile.nginx.prod
         platforms: linux/amd64
         push: false

.github/workflows/deploytest.yml

@@ -27,7 +27,7 @@ jobs:
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Use pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js
@@ -47,13 +47,13 @@ jobs:
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python 3.10
       uses: actions/setup-python@v6
       with:
         python-version: '3.10'
     - name: pip cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pyprod-${{ hashFiles('requirements.txt') }}

.github/workflows/frontendtest.yml

@@ -27,7 +27,7 @@ jobs:
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Use pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js

.github/workflows/pre-commit.yml

@@ -31,7 +31,7 @@ jobs:
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
       with:
         python-version: '3.10'

.github/workflows/pythontest.yml

@@ -61,7 +61,7 @@ jobs:
           # Maps port 6379 on service container to the host
           - 6379:6379
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up minio
       run: |
         docker run -d -p 9000:9000 --name minio \
@@ -74,7 +74,7 @@ jobs:
       with:
         python-version: '3.10'
     - name: pip cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pytest-${{ hashFiles('requirements.txt', 'requirements-dev.txt') }}

.gitmodules

@@ -171,11 +171,7 @@ dcbuild:
 	$(DOCKER_COMPOSE) build
 
 dcup: .docker/minio .docker/postgres
-	# run all services except for cloudprober
-	$(DOCKER_COMPOSE) up studio-app celery-worker
-
-dcup-cloudprober: .docker/minio .docker/postgres
-	# run all services including cloudprober
+	# run all services
 	$(DOCKER_COMPOSE) up
 
 dcdown: