Bladeren bron

Merge pull request #9906 from crobibero/update-gha

Bond-009 1 jaar geleden
bovenliggende
commit
c078391aec
1 gewijzigde bestanden met toevoegingen van 3 en 1 verwijderingen
  1. 3 1
      .github/workflows/openapi.yml

+ 3 - 1
.github/workflows/openapi.yml

@@ -45,10 +45,12 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           fetch-depth: 0
           fetch-depth: 0
       - name: Checkout common ancestor
       - name: Checkout common ancestor
+        env:
+          HEAD_REF: ${{ github.head_ref }}
         run: |
         run: |
           git remote add upstream https://github.com/${{ github.event.pull_request.base.repo.full_name }}
           git remote add upstream https://github.com/${{ github.event.pull_request.base.repo.full_name }}
           git -c protocol.version=2 fetch --prune --progress --no-recurse-submodules upstream +refs/heads/*:refs/remotes/upstream/* +refs/tags/*:refs/tags/*
           git -c protocol.version=2 fetch --prune --progress --no-recurse-submodules upstream +refs/heads/*:refs/remotes/upstream/* +refs/tags/*:refs/tags/*
-          ANCESTOR_REF=$(git merge-base upstream/${{ github.base_ref }} origin/${{ github.head_ref }})
+          ANCESTOR_REF=$(git merge-base upstream/${{ github.base_ref }} origin/$HEAD_REF)
           git checkout --progress --force $ANCESTOR_REF
           git checkout --progress --force $ANCESTOR_REF
       - name: Setup .NET
       - name: Setup .NET
         uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
         uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0