Skip to content

Commit 094eb92

Browse files
committed
fix(ci): Generate PR into caller branch for store-type updates.
Signed-off-by: spbsoluble <1661003+spbsoluble@users.noreply.github.com>
1 parent b19462b commit 094eb92

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

.github/workflows/update-stores.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff 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,7 +133,9 @@ 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?
138+
ls -la ./merge-folder/
142139
143140
# Diff the new json against the saved copy and set an UPDATE_FILE variable
144141
- name: Diff the results
@@ -159,7 +156,7 @@ jobs:
159156
env:
160157
GITHUB_TOKEN: ${{ secrets.SDK_SYNC_PAT }}
161158
with:
162-
add: store_types.json cmd/store_types.json --force
159+
add: store_types.json ./cmd/store_types.json --force
163160
message: Update store_types.json for ${{env.KFUTIL_ARG}}:${{env.TARGET_REPO_BRANCH}}
164161
author_name: Keyfactor
165162
author_email: keyfactor@keyfactor.github.io
@@ -172,7 +169,7 @@ jobs:
172169
env:
173170
GITHUB_TOKEN: ${{ secrets.SDK_SYNC_PAT }}
174171
with:
175-
add: store_types.json cmd/store_types.json --force
172+
add: store_types.json ./cmd/store_types.json --force
176173
message: Update store_types.json for ${{env.KFUTIL_ARG}}:${{env.TARGET_REPO_BRANCH}}
177174
author_name: Keyfactor
178175
author_email: keyfactor@keyfactor.github.io
@@ -187,7 +184,7 @@ jobs:
187184
console.log("Commit to ${{env.KFUTIL_ARG}} for PR")
188185
const owner = context.repo.owner;
189186
const repo = context.repo.repo;
190-
const baseBranch = 'main';
187+
const baseBranch = context.ref.replace('refs/heads/', 'main'); // Default base branch is main
191188
const newBranch = '${{env.KFUTIL_ARG}}';
192189
const response = await github.rest.pulls.create({
193190
owner,

0 commit comments

Comments
 (0)