Merge pull request #988 from burningmantech/cleanup

Match CI with -server

.github/dependabot.yml

@@ -8,14 +8,14 @@ updates:
     allow:
       - dependency-type: "all"
     schedule:
-      interval: weekly
+      interval: "weekly"
     open-pull-requests-limit: 10
     labels:
       - "Task"
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: weekly
+      interval: "weekly"
     labels:
       - "Task"

.github/workflows/dependabot-automerge.yml → .github/workflows/automerge.yml

@@ -12,20 +12,14 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    if: ${{ github.actor == 'dependabot[bot]' }}
+    if: ${{ contains('["dependabot[bot]", "pre-commit-ci[bot]"]', github.actor) }}
     steps:
-      - name: Get Dependabot metadata
-        id: dependabot-metadata
-        uses: dependabot/[email protected]
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-
       - name: Approve the PR
         run: gh pr review --approve "${{ github.event.pull_request.html_url }}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Enable auto-merge
-        run: gh pr merge --merge --auto "${{ github.event.pull_request.html_url }}"
+        run: gh pr merge --squash --auto "${{ github.event.pull_request.html_url }}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/autoupdate.yaml

@@ -0,0 +1,20 @@
+name: Update branch for PRs that are passing and approved for merging
+
+on:
+  schedule:
+    - cron: "0 4 * * *" # Daily at 4am
+
+jobs:
+  update-branches:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Update branches
+        uses: brainly/[email protected]
+        id: autoUpdateBranch
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          requiredPassedChecks: 1
+          requiredApprovals: 1
+          update-limits: 2

.github/workflows/cicd.yml

@@ -1,5 +1,4 @@
-# Docs:
-# https://help.github.com/en/actions/automating-your-workflow-with-github-actions
+# Docs: https://docs.github.com/en/actions
 
 name: CI/CD
 
@@ -47,9 +46,6 @@ jobs:
 
       - name: Build application
         run: npm run build
-        env:
-          # Disable warnings due to https://github.com/twbs/bootstrap/pull/36258
-          CI: "false"
 
       - name: Run unit tests
         run: npm test -- --ci --watchAll=false --coverage
@@ -99,7 +95,7 @@ jobs:
           mkdir images;
           docker image save ranger-ims-web:dev | gzip -6 > images/web.tgz;
 
-      - name: Upload Docker image artifact
+      - name: Upload Docker image artifacts
         uses: actions/upload-artifact@v4
         with:
           name: images
@@ -126,7 +122,7 @@ jobs:
       - name: Checkout source code
         uses: actions/checkout@v4
 
-      - name: Download Docker image artifact
+      - name: Download Docker image artifacts
         uses: actions/download-artifact@v4
         with:
           name: images