From 31a41b2aca7ef4447617851cb52bbaddae72bb5c Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Wed, 5 Feb 2020 07:19:19 +0900 Subject: [PATCH 1/5] =?UTF-8?q?(=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF?= =?UTF-8?q?=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0)=20appveyor=20=E5=9B=BA?= =?UTF-8?q?=E6=9C=89=E5=A4=89=E6=95=B0=E3=82=92=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/githash.bat | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/sakura/githash.bat b/sakura/githash.bat index ac3efd576a..4bfa01b605 100644 --- a/sakura/githash.bat +++ b/sakura/githash.bat @@ -227,12 +227,6 @@ exit /b 0 echo #define GIT_TAG_NAME "%GIT_TAG_NAME%" ) - if "%APPVEYOR_URL%" == "" ( - echo // APPVEYOR_URL is not defined - ) else ( - echo #define APPVEYOR_URL "%APPVEYOR_URL%" - ) - if "%CI_REPO_NAME%" == "" ( echo // CI_REPO_NAME is not defined ) else ( @@ -248,12 +242,6 @@ exit /b 0 echo #define CI_ACCOUNT_NAME "%CI_ACCOUNT_NAME%" ) - if "%APPVEYOR_PROJECT_SLUG%" == "" ( - echo // APPVEYOR_PROJECT_SLUG is not defined - ) else ( - echo #define APPVEYOR_PROJECT_SLUG "%APPVEYOR_PROJECT_SLUG%" - ) - if "%CI_BUILD_VERSION%" == "" ( echo // CI_BUILD_VERSION is not defined ) else ( @@ -310,4 +298,20 @@ exit /b 0 echo #define CI_BUILD_URL "%CI_BUILD_URL%" ) + echo // APPVEYOR specific variables + + if "%APPVEYOR_URL%" == "" ( + echo // APPVEYOR_URL is not defined + ) else ( + echo #define APPVEYOR_URL "%APPVEYOR_URL%" + ) + + if "%APPVEYOR_PROJECT_SLUG%" == "" ( + echo // APPVEYOR_PROJECT_SLUG is not defined + ) else ( + echo #define APPVEYOR_PROJECT_SLUG "%APPVEYOR_PROJECT_SLUG%" + ) + echo // APPVEYOR specific variables end + echo // + exit /b 0 From ebfaca0d0bb9b699936d9f674c283a77b96833df Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sun, 9 Feb 2020 16:40:09 +0900 Subject: [PATCH 2/5] =?UTF-8?q?(=E3=83=AD=E3=82=B0=E6=95=B4=E5=BD=A2)=20CI?= =?UTF-8?q?=5FBUILD=5FURL=20=E3=81=AE=E3=83=AD=E3=82=B0=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E3=82=92=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/githash.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sakura/githash.bat b/sakura/githash.bat index 4bfa01b605..3e34676bb9 100644 --- a/sakura/githash.bat +++ b/sakura/githash.bat @@ -178,11 +178,11 @@ exit /b 0 @echo APPVEYOR_PROJECT_SLUG : %APPVEYOR_PROJECT_SLUG% @echo CI_BUILD_VERSION : %CI_BUILD_VERSION% @echo CI_BUILD_NUMBER : %CI_BUILD_NUMBER% + @echo CI_BUILD_URL : %CI_BUILD_URL% @echo GITHUB_COMMIT_URL : %GITHUB_COMMIT_URL% @echo GITHUB_COMMIT_URL_PR_HEAD : %GITHUB_COMMIT_URL_PR_HEAD% @echo GITHUB_PR_HEAD_COMMIT : %GITHUB_PR_HEAD_COMMIT% @echo GITHUB_PR_HEAD_SHORT_COMMIT : %GITHUB_PR_HEAD_SHORT_COMMIT% - @echo CI_BUILD_URL : %CI_BUILD_URL% if exist "%GITHASH_H%" del "%GITHASH_H%" move /y "%GITHASH_H_TMP%" "%GITHASH_H%" From d002acfa330586048e8f57932e06d71e4f8bf79f Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sun, 9 Feb 2020 16:41:39 +0900 Subject: [PATCH 3/5] =?UTF-8?q?(=E3=83=AD=E3=82=B0=E6=95=B4=E5=BD=A2)=20AP?= =?UTF-8?q?PVEYOR=5FURL=20=E3=81=A8=20APPVEYOR=5FPROJECT=5FSLUG=20?= =?UTF-8?q?=E3=81=AE=E3=83=AD=E3=82=B0=E5=87=BA=E5=8A=9B=E3=82=92=E7=A7=BB?= =?UTF-8?q?=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/githash.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sakura/githash.bat b/sakura/githash.bat index 3e34676bb9..920367497e 100644 --- a/sakura/githash.bat +++ b/sakura/githash.bat @@ -172,10 +172,8 @@ exit /b 0 @echo TEMP_GIT_COMMIT_HASH : %TEMP_GIT_COMMIT_HASH% @echo GIT_REMOTE_ORIGIN_URL : %GIT_REMOTE_ORIGIN_URL% @echo GIT_TAG_NAME : %GIT_TAG_NAME% - @echo APPVEYOR_URL : %APPVEYOR_URL% @echo CI_REPO_NAME : %CI_REPO_NAME% @echo CI_ACCOUNT_NAME : %CI_ACCOUNT_NAME% - @echo APPVEYOR_PROJECT_SLUG : %APPVEYOR_PROJECT_SLUG% @echo CI_BUILD_VERSION : %CI_BUILD_VERSION% @echo CI_BUILD_NUMBER : %CI_BUILD_NUMBER% @echo CI_BUILD_URL : %CI_BUILD_URL% @@ -183,6 +181,8 @@ exit /b 0 @echo GITHUB_COMMIT_URL_PR_HEAD : %GITHUB_COMMIT_URL_PR_HEAD% @echo GITHUB_PR_HEAD_COMMIT : %GITHUB_PR_HEAD_COMMIT% @echo GITHUB_PR_HEAD_SHORT_COMMIT : %GITHUB_PR_HEAD_SHORT_COMMIT% + @echo APPVEYOR_URL : %APPVEYOR_URL% + @echo APPVEYOR_PROJECT_SLUG : %APPVEYOR_PROJECT_SLUG% if exist "%GITHASH_H%" del "%GITHASH_H%" move /y "%GITHASH_H_TMP%" "%GITHASH_H%" From 46c99ac44a4d76929be08e246711477b8ee90b43 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sun, 9 Feb 2020 16:42:07 +0900 Subject: [PATCH 4/5] =?UTF-8?q?(=E3=83=AD=E3=82=B0=E6=95=B4=E5=BD=A2)=20?= =?UTF-8?q?=E7=A9=BA=E8=A1=8C=E3=82=92=E5=87=BA=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/githash.bat | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sakura/githash.bat b/sakura/githash.bat index 920367497e..adfc60d665 100644 --- a/sakura/githash.bat +++ b/sakura/githash.bat @@ -172,15 +172,18 @@ exit /b 0 @echo TEMP_GIT_COMMIT_HASH : %TEMP_GIT_COMMIT_HASH% @echo GIT_REMOTE_ORIGIN_URL : %GIT_REMOTE_ORIGIN_URL% @echo GIT_TAG_NAME : %GIT_TAG_NAME% + @echo. @echo CI_REPO_NAME : %CI_REPO_NAME% @echo CI_ACCOUNT_NAME : %CI_ACCOUNT_NAME% @echo CI_BUILD_VERSION : %CI_BUILD_VERSION% @echo CI_BUILD_NUMBER : %CI_BUILD_NUMBER% @echo CI_BUILD_URL : %CI_BUILD_URL% + @echo. @echo GITHUB_COMMIT_URL : %GITHUB_COMMIT_URL% @echo GITHUB_COMMIT_URL_PR_HEAD : %GITHUB_COMMIT_URL_PR_HEAD% @echo GITHUB_PR_HEAD_COMMIT : %GITHUB_PR_HEAD_COMMIT% @echo GITHUB_PR_HEAD_SHORT_COMMIT : %GITHUB_PR_HEAD_SHORT_COMMIT% + @echo. @echo APPVEYOR_URL : %APPVEYOR_URL% @echo APPVEYOR_PROJECT_SLUG : %APPVEYOR_PROJECT_SLUG% From 2a18c7a2dec0dc213fbd5124a17f9589378be5d9 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Wed, 5 Feb 2020 10:14:08 +0900 Subject: [PATCH 5/5] =?UTF-8?q?GITHUB=5FPR=5FHEAD=5FSHORT=5FCOMMIT=20?= =?UTF-8?q?=E3=81=AE=E5=AE=9A=E7=BE=A9=E4=BD=8D=E7=BD=AE=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/githash.bat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sakura/githash.bat b/sakura/githash.bat index adfc60d665..7c7970dc1c 100644 --- a/sakura/githash.bat +++ b/sakura/githash.bat @@ -103,6 +103,12 @@ exit /b 0 set GITHUB_PR_HEAD_COMMIT=%APPVEYOR_PULL_REQUEST_HEAD_COMMIT% ) + if not "%GITHUB_PR_HEAD_COMMIT%" == "" ( + set GITHUB_PR_HEAD_SHORT_COMMIT=%GITHUB_PR_HEAD_COMMIT:~0,8% + ) else ( + set GITHUB_PR_HEAD_SHORT_COMMIT= + ) + if "%BUILD_REPOSITORY_PROVIDER%"=="GitHub" ( set GITHUB_ON=1 ) @@ -118,12 +124,6 @@ exit /b 0 set "GITHUB_COMMIT_URL_PR_HEAD=%PREFIX_GITHUB%/%CI_REPO_NAME%/pull/%GITHUB_PR_NUMBER%/commits/%GITHUB_PR_HEAD_COMMIT%" ) ) - - if not "%GITHUB_PR_HEAD_COMMIT%" == "" ( - set GITHUB_PR_HEAD_SHORT_COMMIT=%GITHUB_PR_HEAD_COMMIT:~0,8% - ) else ( - set GITHUB_PR_HEAD_SHORT_COMMIT= - ) exit /b 0 :set_ci_build_url