From 55cc6b8deef850238ea02cdebad4f24a02f961c2 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 24 Feb 2023 13:48:17 +0900
Subject: update PULL_REQUEST_TEMPLATE

---
 .github/PULL_REQUEST_TEMPLATE.md            | 17 -----------------
 .github/PULL_REQUEST_TEMPLATE/01_bug.md     | 17 +++++++++++++++++
 .github/PULL_REQUEST_TEMPLATE/02_enhance.md | 17 +++++++++++++++++
 .github/PULL_REQUEST_TEMPLATE/03_release.md | 10 ++++++++++
 4 files changed, 44 insertions(+), 17 deletions(-)
 delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE/01_bug.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE/02_enhance.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE/03_release.md

(limited to '.github')

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 79ca97dfa0..0000000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- ℹ お読みください / README
-PRありがとうございます！ PRを作成する前に、コントリビューションガイドをご確認ください:
-Thank you for your PR! Before creating a PR, please check the contribution guide:
-https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
--->
-
-# What
-<!-- このPRで何をしたのか？ どう変わるのか？ -->
-<!-- What did you do with this PR? How will it change things? -->
-
-# Why
-<!-- なぜそうするのか？ どういう意図なのか？ 何が困っているのか？ -->
-<!-- Why do you do it? What are your intentions? What is the problem? -->
-
-# Additional info (optional)
-<!-- テスト観点など -->
-<!-- Test perspective, etc -->
diff --git a/.github/PULL_REQUEST_TEMPLATE/01_bug.md b/.github/PULL_REQUEST_TEMPLATE/01_bug.md
new file mode 100644
index 0000000000..79ca97dfa0
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/01_bug.md
@@ -0,0 +1,17 @@
+<!-- ℹ お読みください / README
+PRありがとうございます！ PRを作成する前に、コントリビューションガイドをご確認ください:
+Thank you for your PR! Before creating a PR, please check the contribution guide:
+https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
+-->
+
+# What
+<!-- このPRで何をしたのか？ どう変わるのか？ -->
+<!-- What did you do with this PR? How will it change things? -->
+
+# Why
+<!-- なぜそうするのか？ どういう意図なのか？ 何が困っているのか？ -->
+<!-- Why do you do it? What are your intentions? What is the problem? -->
+
+# Additional info (optional)
+<!-- テスト観点など -->
+<!-- Test perspective, etc -->
diff --git a/.github/PULL_REQUEST_TEMPLATE/02_enhance.md b/.github/PULL_REQUEST_TEMPLATE/02_enhance.md
new file mode 100644
index 0000000000..79ca97dfa0
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/02_enhance.md
@@ -0,0 +1,17 @@
+<!-- ℹ お読みください / README
+PRありがとうございます！ PRを作成する前に、コントリビューションガイドをご確認ください:
+Thank you for your PR! Before creating a PR, please check the contribution guide:
+https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
+-->
+
+# What
+<!-- このPRで何をしたのか？ どう変わるのか？ -->
+<!-- What did you do with this PR? How will it change things? -->
+
+# Why
+<!-- なぜそうするのか？ どういう意図なのか？ 何が困っているのか？ -->
+<!-- Why do you do it? What are your intentions? What is the problem? -->
+
+# Additional info (optional)
+<!-- テスト観点など -->
+<!-- Test perspective, etc -->
diff --git a/.github/PULL_REQUEST_TEMPLATE/03_release.md b/.github/PULL_REQUEST_TEMPLATE/03_release.md
new file mode 100644
index 0000000000..0c71ea804d
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/03_release.md
@@ -0,0 +1,10 @@
+# Summary
+This is a release PR.
+
+For more information on the release instructions, please see:
+https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md#release
+
+# Checklist
+- [ ] package.jsonのバージョンが正しく更新されている
+- [ ] CHANGELOGが過不足無く更新されている
+- [ ] CIが全て通っている
-- 
cgit v1.2.3-freya


From a7943dceca7b958b194e07858699a65b8ed5c7a5 Mon Sep 17 00:00:00 2001
From: Masaya Suzuki <15100604+massongit@users.noreply.github.com>
Date: Fri, 24 Feb 2023 18:51:31 +0900
Subject: 
 デプロイされているプレビュー環境がない場合はプレビュー環境を削除しないようにする
 (#10062)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* デプロイされているプレビュー環境がない場合はDestroy preview environmentを実行しないようにする

* CIがない場合の処理追加
---
 .github/workflows/pr-preview-destroy.yml | 34 +++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to '.github')

diff --git a/.github/workflows/pr-preview-destroy.yml b/.github/workflows/pr-preview-destroy.yml
index 49f1ba8a34..8adfad9dab 100644
--- a/.github/workflows/pr-preview-destroy.yml
+++ b/.github/workflows/pr-preview-destroy.yml
@@ -9,14 +9,46 @@ name: Destroy preview environment
 jobs:
   destroy-preview-environment:
     runs-on: ubuntu-latest
-    if: github.repository == github.event.pull_request.head.repo.full_name
     steps:
+      - uses: actions/github-script@v6.3.3
+        id: check-conclusion
+        env:
+          number: ${{ github.event.number }}
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          result-encoding: string
+          script: |
+            const { data: pull } = await github.rest.pulls.get({
+              ...context.repo,
+              pull_number: process.env.number
+            });
+            const ref = pull.head.sha;
+
+            const { data: checks } = await github.rest.checks.listForRef({
+              ...context.repo,
+              ref
+            });
+
+            const check = checks.check_runs.filter(c => c.name === 'deploy-preview-environment');
+
+            if (check.length === 0) {
+              return;
+            }
+
+            const { data: result } = await github.rest.checks.get({
+              ...context.repo,
+              check_run_id: check[0].id,
+            });
+
+            return result.conclusion;
       - name: Context
+        if: steps.check-conclusion.outputs.result == 'success'
         uses: okteto/context@latest
         with:
           token: ${{ secrets.OKTETO_TOKEN }}
 
       - name: Destroy preview environment
+        if: steps.check-conclusion.outputs.result == 'success'
         uses: okteto/destroy-preview@latest
         with:
           name: pr-${{ github.event.number }}-syuilo
-- 
cgit v1.2.3-freya