Skip to content

Commit 7e4d028

Browse files
committed
fix CI build
1 parent efa98f5 commit 7e4d028

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

Build.ps1

+16
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,22 @@ function CreateNuGetPackage {
9393
CheckLastExitCode
9494
}
9595

96+
function LoadBaseBranchIfNotMaster(){
97+
98+
Write-Output $env:APPVEYOR_REPO_BRANCH
99+
if ($env:APPVEYOR_REPO_BRANCH -ne "master") {
100+
git fetch origin ${env:APPVEYOR_REPO_BRANCH}:${env:APPVEYOR_REPO_BRANCH}
101+
Write-Output YAY
102+
$revparse = git rev-parse 'openapi'
103+
Write-Output $revparse
104+
$git2 = git branch
105+
Write-Output $git2
106+
107+
}
108+
}
109+
110+
LoadBaseBranchIfNotMaster
111+
96112
dotnet tool restore
97113
CheckLastExitCode
98114

appveyor.yml

-7
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ branches:
2020
- unstable
2121
- /release\/.+/
2222

23-
# This ensures the base branch is loaded which is required for regitlint to run.
24-
clone_script:
25-
- ps: |
26-
git clone -q --branch=$env:APPVEYOR_REPO_BRANCH https://github.com/$env:APPVEYOR_REPO_NAME.git $env:APPVEYOR_BUILD_FOLDER
27-
git fetch -q origin +refs/pull/$env:APPVEYOR_PULL_REQUEST_NUMBER/merge:
28-
git checkout -qf FETCH_HEAD
29-
3023
pull_requests:
3124
do_not_increment_build_number: true
3225

test/OpenApiTests/openapi.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,7 @@
937937
"type": "string",
938938
"nullable": true
939939
},
940-
"plannedDeparture": {
940+
"departsAt": {
941941
"type": "string",
942942
"format": "date-time"
943943
}

0 commit comments

Comments
 (0)