Merge branch 'master' into maintenance

7 files changed, 28 insertions, 36 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c6f89e6d6..9eb7968ca 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,11 +11,11 @@ jobs:
     name: 🔨 Build distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: 🏗 Set up Python 3.7
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.7
       - name: 🏗 Install build dependencies
@@ -25,7 +25,7 @@ jobs:
         run: |
           python setup.py sdist bdist_wheel
       - name: ⬆ Upload build result
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: dist
           path: dist
@@ -34,9 +34,9 @@ jobs:
     name: 🧹 Pre-commit
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: 🏗 Set up Python 3.7
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.7
       - name: 🏗 Set up dev dependencies
@@ -53,9 +53,9 @@ jobs:
         python: ["3.7", "3.8", "3.9", "3.10"]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: 🏗 Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
       - name: 🏗 Set up test dependencies
@@ -70,7 +70,7 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: 🏗 Set up test dependencies
         run: |
           npm -g install node-qunit-puppeteer@2.1.0
@@ -89,12 +89,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⬇ Download build result
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist
       - name: 🏗 Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
       - name: 🚀 Install wheel
@@ -113,15 +113,15 @@ jobs:
     continue-on-error: true
     steps:
       - name: ⬇ Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: ⬇ Download build result
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist
       - name: 🏗 Set up Python 3.7
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.7
       - name: 🚀 Install wheel
@@ -134,7 +134,7 @@ jobs:
           cp -r .github/fixtures/with_acl/* e2econfig
 
       - name: 🚀 Run Cypress
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v4.2.0
         with:
           working-directory: tests/cypress
           browser: chrome
@@ -146,7 +146,7 @@ jobs:
           CYPRESS_DEPLOYSENTINEL_KEY: ${{ secrets.DEPLOYSENTINEL_APIKEY }}
 
       - name: ⬆ Upload screenshots
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: cypress-screenshots
@@ -170,7 +170,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⬇ Download build result
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist
@@ -188,7 +188,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⬇ Download build result
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist
diff --git a/.github/workflows/issue_automation.yml b/.github/workflows/issue_automation.yml
index 13830c66a..ab645ab90 100644
--- a/.github/workflows/issue_automation.yml
+++ b/.github/workflows/issue_automation.yml
@@ -7,7 +7,7 @@ jobs:
   issue-automation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -72,7 +72,7 @@ jobs:
       #  with:
       #    repo-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v6
         env:
           REMINDER: >
             Hi @${{ github.event.issue.user.login }}!
diff --git a/.github/workflows/linkify_bundles.yml b/.github/workflows/linkify_bundles.yml
index 9e0553891..18bc21a07 100644
--- a/.github/workflows/linkify_bundles.yml
+++ b/.github/workflows/linkify_bundles.yml
@@ -7,7 +7,7 @@ jobs:
   linkifyBundles:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v2
+      - uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -38,14 +38,14 @@ jobs:
               });
               text += "\n*edited by @github-actions to add bundle viewer links*\n";
 
-              github.issues.updateComment({
+              github.rest.issues.updateComment({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 comment_id: context.payload.comment.id,
                 body: text
               });
             } else if (botWasHere !== -1) {
-              github.issues.updateComment({
+              github.rest.issues.updateComment({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 comment_id: context.payload.comment.id,
diff --git a/.github/workflows/nightly_merge.yml b/.github/workflows/nightly_merge.yml
index 56821fbc0..e101eb722 100644
--- a/.github/workflows/nightly_merge.yml
+++ b/.github/workflows/nightly_merge.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: ⬇ Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/pr_automation.yml b/.github/workflows/pr_automation.yml
index cc411d121..a7f7ef7cf 100644
--- a/.github/workflows/pr_automation.yml
+++ b/.github/workflows/pr_automation.yml
@@ -12,7 +12,7 @@ jobs:
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
 
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
diff --git a/.github/workflows/test_install.yml b/.github/workflows/test_install.yml
index 76d7b2e23..18f6d7b39 100644
--- a/.github/workflows/test_install.yml
+++ b/.github/workflows/test_install.yml
@@ -19,11 +19,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: 🐍 Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
       - name: ⬇ Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ matrix.branch }}
           fetch-depth: 0
@@ -60,7 +60,7 @@ jobs:
         with:
           repository: "OctoPrint/OctoPrint"
       - name: 🐍 Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
       - name: 👷 Build and install latest release
diff --git a/SECURITY.md b/SECURITY.md
index 79b94cdd9..0722f9a3c 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,11 +1,3 @@
 # Security Policy
 
-## Supported Versions
-
-Always update to the latest version of OctoPrint to keep up with security patches.
-
-## Reporting a Vulnerability
-
-Email to security@octoprint.org.
-
-For the sake of the userbase of OctoPrint please always disclose responsibly and with a 90+ day window.
+OctoPrint's security policy can be found [here](https://octoprint.org/security/).