Skip to content

Merge to main #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spbsoluble merged 8 commits into from
Sep 15, 2025
Merged

Merge to main #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e357382
fix(ci): `update-stores` to also update the internal `cmd/store-types…
spbsoluble Sep 10, 2025
069e1c2
chore(store-types): Update internal store-types with latest data and …
spbsoluble Sep 10, 2025
b19462b
chore(ci): Don't `cat` the store-types.json after running python script.
spbsoluble Sep 10, 2025
581a304
fix(ci): Generate PR into caller branch for store-type updates.
spbsoluble Sep 10, 2025
2bcb76a
Update store_types.json for all:latest
Sep 10, 2025
ecd705a
fix(ci): Generate PR into caller branch for store-type updates.
spbsoluble Sep 10, 2025
075a980
Merge branch 'stype-deps-bump' into all
spbsoluble Sep 10, 2025
80e84e7
Merge pull request #282 from Keyfactor/all
spbsoluble Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions .github/workflows/update-stores.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ jobs:
repository: 'keyfactor/kfutil'
sparse-checkout: |
.github
cmd
path: './merge-folder/'
token: ${{ secrets.V2BUILDTOKEN }}
ref: '${{env.KFUTIL_ARG}}'
Expand All @@ -81,6 +82,7 @@ jobs:
repository: 'keyfactor/kfutil'
sparse-checkout: |
.github
cmd
path: './merge-folder/'
token: ${{ secrets.V2BUILDTOKEN }}

Expand All @@ -102,7 +104,6 @@ jobs:
working-directory: ./tools/store-type-merge
run: |
python main.py --repo-name ${{ env.KFUTIL_ARG }} --ref ${{ env.TARGET_REPO_BRANCH }}
cat store_types.json
env:
GITHUB_TOKEN: ${{ secrets.V2BUILDTOKEN }}

Expand Down Expand Up @@ -134,6 +135,10 @@ jobs:
run: |
echo "Saving original store_types.json as store_types.sav.json"
cp -f ./tools/store-type-merge/store_types.json ./merge-folder/store_types.json
mkdir -p ./merge-folder/cmd || true
cp -f ./tools/store-type-merge/store_types.json ./merge-folder/cmd/store_types.json # this necessary?
ls -la ./merge-folder/
ls -la ./merge-folder/cmd/

# Diff the new json against the saved copy and set an UPDATE_FILE variable
- name: Diff the results
Expand All @@ -154,7 +159,9 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.SDK_SYNC_PAT }}
with:
add: store_types.json --force
add: |
store_types.json
./cmd/store_types.json --force
message: Update store_types.json for ${{env.KFUTIL_ARG}}:${{env.TARGET_REPO_BRANCH}}
author_name: Keyfactor
author_email: keyfactor@keyfactor.github.io
Expand All @@ -167,7 +174,9 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.SDK_SYNC_PAT }}
with:
add: store_types.json --force
add: |
store_types.json
./cmd/store_types.json --force
message: Update store_types.json for ${{env.KFUTIL_ARG}}:${{env.TARGET_REPO_BRANCH}}
author_name: Keyfactor
author_email: keyfactor@keyfactor.github.io
Expand All @@ -182,7 +191,13 @@ jobs:
console.log("Commit to ${{env.KFUTIL_ARG}} for PR")
const owner = context.repo.owner;
const repo = context.repo.repo;
const baseBranch = 'main';

// Get the current branch name that the workflow is running on
const baseBranch = context.payload.ref ?
context.payload.ref.replace('refs/heads/', '') : 'main';

console.log(`Base branch for PR: ${baseBranch}`);

const newBranch = '${{env.KFUTIL_ARG}}';
const response = await github.rest.pulls.create({
owner,
Expand Down
Loading
Loading