diff --git a/.github/workflows/sync-migtools-main.yml b/.github/workflows/sync-migtools-main.yml index 1629a34ba..1095a5664 100644 --- a/.github/workflows/sync-migtools-main.yml +++ b/.github/workflows/sync-migtools-main.yml @@ -2,11 +2,6 @@ name: Sync with konveyor on: workflow_dispatch: - inputs: - branch: - description: "Branch to sync to" - required: true - default: "main" # Manual triggering only jobs: @@ -37,15 +32,15 @@ jobs: - name: Add konveyor remote run: | git remote add konveyor https://github.com/konveyor/editor-extensions.git - git fetch konveyor ${{ inputs.branch }} + git fetch konveyor ${{ github.ref_name }} - name: Attempt rebase onto konveyor run: | echo "Current branch: $(git branch --show-current)" - echo "Attempting to rebase onto konveyor/${{ inputs.branch }}..." + echo "Attempting to rebase onto konveyor/${{ github.ref_name }}..." # This will fail hard if there are conflicts - git rebase konveyor/${{ inputs.branch }} + git rebase konveyor/${{ github.ref_name }} echo "Rebase successful!" diff --git a/scripts/prebuild.js b/scripts/prebuild.js index 5a5c1aed1..2e9193e2a 100644 --- a/scripts/prebuild.js +++ b/scripts/prebuild.js @@ -36,8 +36,8 @@ const PLATFORM_MAPPING = { // Binary names for each platform const PLATFORM_BINARY_NAMES = { - "linux-x64": "linux-mta-analyzer-rpc", - "linux-arm64": "linux-mta-analyzer-rpc", + "linux-x64": "mta-analyzer-rpc", + "linux-arm64": "mta-analyzer-rpc", "darwin-x64": "darwin-mta-analyzer-rpc", "darwin-arm64": "darwin-mta-analyzer-rpc", "win32-x64": "windows-mta-analyzer-rpc.exe", @@ -186,13 +186,8 @@ Object.assign(packageJson, { }); // Remove kai binary assets from package (they'll be downloaded at runtime) -// Keep them for CI/test builds to avoid timing issues -if (packageJson.includedAssetPaths?.kai && !process.env.CI && !process.env.KEEP_KAI_BINARIES) { - delete packageJson.includedAssetPaths.kai; - console.log("✅ Removed kai binary assets from package (runtime download enabled)"); -} else if (packageJson.includedAssetPaths?.kai) { - console.log("✅ Keeping kai binary assets for CI/test build"); -} +delete packageJson.includedAssetPaths.kai; +console.log("✅ Removed kai binary assets from package (runtime download enabled)"); // Transform configuration properties if (packageJson.contributes?.configuration?.properties) {