From 842dea4bd5c35a5b2774f2687c8a021bb81f6ac9 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 30 Jun 2020 18:18:58 -0500
Subject: [PATCH] Updated lock / unlock actions

---
 .github/lock.yml                      | 40 ---------------------------
 .github/workflows/close-stale.yml     |  3 +-
 .github/workflows/lock-closed.yml     | 20 ++++++++++----
 .github/workflows/unlock-reopened.yml | 18 ++++++++++++
 4 files changed, 35 insertions(+), 46 deletions(-)
 delete mode 100644 .github/lock.yml
 create mode 100644 .github/workflows/unlock-reopened.yml

diff --git a/.github/lock.yml b/.github/lock.yml
deleted file mode 100644
index c5ceff66b0..0000000000
--- a/.github/lock.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
-#
-
-# Number of days of inactivity before a closed issue or pull request is locked
-daysUntilLock: 60
-
-# Skip issues and pull requests created before a given timestamp. Timestamp must
-# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
-skipCreatedBefore: false
-
-# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
-exemptLabels: [ 'no-locking' ]
-
-# Label to add before locking, such as `outdated`. Set to `false` to disable
-lockLabel: false
-
-# Comment to post before locking. Set to `false` to disable
-lockComment: >
-  This thread has been automatically locked since there has not been
-  any recent activity after it was closed. Please open a new issue for
-  related bugs.
-
-# Assign `resolved` as the reason for locking. Set to `false` to disable
-setLockReason: true
-
-# Limit to only `issues` or `pulls`
-# only: issues
-
-# Optionally, specify configuration settings just for `issues` or `pulls`
-# issues:
-#   exemptLabels:
-#     - help-wanted
-#   lockLabel: outdated
-
-# pulls:
-#   daysUntilLock: 30
-
-# Repository to extend settings from
-# _extends: repo
diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml
index 65604afa91..fae13f3a93 100644
--- a/.github/workflows/close-stale.yml
+++ b/.github/workflows/close-stale.yml
@@ -7,7 +7,7 @@ name: "Close stale issues"
 
 on:
   schedule:
-  - cron: "0 1 * * *"
+  - cron: "22 1 * * *"
 
 jobs:
   stale:
@@ -20,3 +20,4 @@ jobs:
         days-before-stale: 30
         days-before-close: 5
         stale-issue-label: 'stale-closing-soon'
+        exempt-issue-labels: 'T: Feature Request'
diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml
index e3303e8c6e..a57e63d2a8 100644
--- a/.github/workflows/lock-closed.yml
+++ b/.github/workflows/lock-closed.yml
@@ -3,16 +3,26 @@
 # Lock closed issues after a period of inactivity
 #
 
-name: "Lock closed issue"
+name: 'Lock threads'
 
 on:
-  issues:
-    types: [closed]
+  schedule:
+    - cron: '59 * * * *'
 
 jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-    - uses: OSDKDev/lock-issues@v1.1
+    - uses: dessant/lock-threads@v2
       with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        github-token: ${{ github.token }}
+        process-only: 'issues'
+        issue-lock-inactive-days: '60'
+        issue-exclude-created-before: ''
+        issue-exclude-labels: 'no-locking'
+        issue-lock-labels: ''
+        issue-lock-comment: >
+          This issue has been automatically locked since there
+          has not been any recent activity after it was closed.
+          Please open a new issue for related bugs.
+        issue-lock-reason: ''
diff --git a/.github/workflows/unlock-reopened.yml b/.github/workflows/unlock-reopened.yml
new file mode 100644
index 0000000000..45e4d713e8
--- /dev/null
+++ b/.github/workflows/unlock-reopened.yml
@@ -0,0 +1,18 @@
+#
+# unlock-reopened.yml
+# Unlock an issue whenever it is re-opened
+#
+
+name: "Unlock reopened issue"
+
+on:
+  issues:
+    types: [reopened]
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: OSDKDev/unlock-issues@v1.1
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"