File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -102,11 +102,6 @@ jobs:
102102 working-directory : ./tools/store-type-merge
103103 run : |
104104 python main.py --repo-name ${{ env.KFUTIL_ARG }} --ref ${{ env.TARGET_REPO_BRANCH }}
105- pwd
106- ls -la
107- ls -la ../
108- ls -la ../../
109- cp -f store_types.json ../../cmd/store_types.json
110105 env :
111106 GITHUB_TOKEN : ${{ secrets.V2BUILDTOKEN }}
112107
@@ -138,6 +133,7 @@ jobs:
138133 run : |
139134 echo "Saving original store_types.json as store_types.sav.json"
140135 cp -f ./tools/store-type-merge/store_types.json ./merge-folder/store_types.json
136+ mkdir -p ./merge-folder/cmd || true
141137 cp -f ./tools/store-type-merge/store_types.json ./merge-folder/cmd/store_types.json # this necessary?
142138
143139 # Diff the new json against the saved copy and set an UPDATE_FILE variable
@@ -187,7 +183,7 @@ jobs:
187183 console.log("Commit to ${{env.KFUTIL_ARG}} for PR")
188184 const owner = context.repo.owner;
189185 const repo = context.repo.repo;
190- const baseBranch = ' main';
186+ const baseBranch = context.ref.replace('refs/heads/', ' main'); // Default base branch is main
191187 const newBranch = '${{env.KFUTIL_ARG}}';
192188 const response = await github.rest.pulls.create({
193189 owner,
You can’t perform that action at this time.
0 commit comments