@@ -35,11 +35,14 @@ jobs:
3535 - name : merge into base_branch
3636 if : ${{ github.event_name == 'pull_request' }}
3737 run : |
38- echo base branch "${{ github.base_ref }} "
39- echo pr branch "${{ github.head_ref }} "
40- git checkout "${{ github.base_ref }} "
38+ echo base branch "$BASE_BRANCH "
39+ echo pr branch "$PR_BRANCH "
40+ git checkout "$BASE_BRANCH "
4141 git checkout -b "merging-${{ github.event.number }}"
4242 git merge --ff-only "${{ github.event.pull_request.head.sha }}"
43+ env :
44+ BASE_BRANCH : ${{ github.base_ref }}
45+ PR_BRANCH : ${{ github.head_ref }}
4346
4447 - name : setup python
4548 uses : actions/setup-python@v5
@@ -164,11 +167,14 @@ jobs:
164167 - name : merge into base_branch
165168 if : ${{ github.event_name == 'pull_request' }}
166169 run : |
167- echo base branch "${{ github.base_ref }} "
168- echo pr branch "${{ github.head_ref }} "
169- git checkout "${{ github.base_ref }} "
170+ echo base branch "$BASE_BRANCH "
171+ echo pr branch "$PR_BRANCH "
172+ git checkout "$BASE_BRANCH "
170173 git checkout -b "merging-${{ github.event.number }}"
171174 git merge --ff-only "${{ github.event.pull_request.head.sha }}"
175+ env :
176+ BASE_BRANCH : ${{ github.base_ref }}
177+ PR_BRANCH : ${{ github.head_ref }}
172178
173179 - name : setup python
174180 uses : actions/setup-python@v5
@@ -248,11 +254,14 @@ jobs:
248254 - name : merge into base_branch
249255 if : ${{ github.event_name == 'pull_request' }}
250256 run : |
251- echo base branch "${{ github.base_ref }} "
252- echo pr branch "${{ github.head_ref }} "
253- git checkout "${{ github.base_ref }} "
257+ echo base branch "$BASE_BRANCH "
258+ echo pr branch "$PR_BRANCH "
259+ git checkout "$BASE_BRANCH "
254260 git checkout -b "merging-${{ github.event.number }}"
255261 git merge --ff-only "${{ github.event.pull_request.head.sha }}"
262+ env :
263+ BASE_BRANCH : ${{ github.base_ref }}
264+ PR_BRANCH : ${{ github.head_ref }}
256265
257266 - name : setup python
258267 uses : actions/setup-python@v5
0 commit comments