File tree Expand file tree Collapse file tree 2 files changed +5
-15
lines changed
Expand file tree Collapse file tree 2 files changed +5
-15
lines changed Original file line number Diff line number Diff line change @@ -2,11 +2,6 @@ name: Sync with konveyor
22
33on :
44 workflow_dispatch :
5- inputs :
6- branch :
7- description : " Branch to sync to"
8- required : true
9- default : " main"
105 # Manual triggering only
116
127jobs :
@@ -37,15 +32,15 @@ jobs:
3732 - name : Add konveyor remote
3833 run : |
3934 git remote add konveyor https://github.com/konveyor/editor-extensions.git
40- git fetch konveyor ${{ inputs.branch }}
35+ git fetch konveyor ${{ github.ref_name }}
4136
4237 - name : Attempt rebase onto konveyor
4338 run : |
4439 echo "Current branch: $(git branch --show-current)"
45- echo "Attempting to rebase onto konveyor/${{ inputs.branch }}..."
40+ echo "Attempting to rebase onto konveyor/${{ github.ref_name }}..."
4641
4742 # This will fail hard if there are conflicts
48- git rebase konveyor/${{ inputs.branch }}
43+ git rebase konveyor/${{ github.ref_name }}
4944
5045 echo "Rebase successful!"
5146
Original file line number Diff line number Diff line change @@ -186,13 +186,8 @@ Object.assign(packageJson, {
186186} ) ;
187187
188188// Remove kai binary assets from package (they'll be downloaded at runtime)
189- // Keep them for CI/test builds to avoid timing issues
190- if ( packageJson . includedAssetPaths ?. kai && ! process . env . CI && ! process . env . KEEP_KAI_BINARIES ) {
191- delete packageJson . includedAssetPaths . kai ;
192- console . log ( "✅ Removed kai binary assets from package (runtime download enabled)" ) ;
193- } else if ( packageJson . includedAssetPaths ?. kai ) {
194- console . log ( "✅ Keeping kai binary assets for CI/test build" ) ;
195- }
189+ delete packageJson . includedAssetPaths . kai ;
190+ console . log ( "✅ Removed kai binary assets from package (runtime download enabled)" ) ;
196191
197192// Transform configuration properties
198193if ( packageJson . contributes ?. configuration ?. properties ) {
You can’t perform that action at this time.
0 commit comments