From c42ba4d3db337e8fc1a96d8c5a2c71ab5adec006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B9=AF=E6=9C=AC=20=E9=96=8B?= <x.yumoto.k@nds-tyo.co.jp>
Date: Thu, 24 Aug 2023 03:23:51 +0000
Subject: [PATCH] =?UTF-8?q?Merged=20PR=20353:=20staging=E7=94=A8pipeline?=
 =?UTF-8?q?=E3=81=AEyml=E3=81=AE=E3=83=88=E3=83=AA=E3=82=AC=E3=83=BC?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 概要
[Task2488: staging用pipelineのymlのトリガーを修正する](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2488)

- （まだ稼働していないStagingデプロイパイプラインの）トリガー部分のチェックロジックが権限不足で動作していなかった箇所を修正

## レビューポイント
- 情報共有

## 動作確認状況
- mainブランチ外のブランチがpipeline上で実行された時に失敗することを確認
---
 azure-pipelines-production.yml | 1 +
 azure-pipelines-staging.yml    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/azure-pipelines-production.yml b/azure-pipelines-production.yml
index 5c57493..b35783a 100644
--- a/azure-pipelines-production.yml
+++ b/azure-pipelines-production.yml
@@ -12,6 +12,7 @@ jobs:
   - checkout: self
     clean: true
     fetchDepth: 1
+    persistCredentials: true
   - script: |
       git fetch origin main:main
       if git merge-base --is-ancestor $(Build.SourceVersion) main; then
diff --git a/azure-pipelines-staging.yml b/azure-pipelines-staging.yml
index 4495b2c..ba3c32c 100644
--- a/azure-pipelines-staging.yml
+++ b/azure-pipelines-staging.yml
@@ -15,6 +15,7 @@ jobs:
   - checkout: self
     clean: true
     fetchDepth: 1
+    persistCredentials: true
   - script: |
       git fetch origin main:main
       if git merge-base --is-ancestor $(Build.SourceVersion) main; then