Skip to content
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

Jump to bottom

external commands (astgen, php-parser etc.): fix and consolidate base dir #4956

Merged
merged 7 commits into from
Oct 7, 2024
Merged

external commands (astgen, php-parser etc.): fix and consolidate base dir #4956

merged 7 commits into from
Oct 7, 2024

Commits on Oct 4, 2024

  1. external commands (astgen, php-parser etc.): fix and consolidate base… 

    … dir

The logic to guess the base dir of the installation is quite fiddly but
works for our use cases for astgen. PhpParser implemented something similar, but
not quite - and it failed for buildbot.

On buildbot the installation path for php2cpg is
`/worker/sptestV2-php2cpg/build/x2cpg-internal/php2cpg/target/universal/stage`
which (prior to this PR) leads to an invalid derived php-parser name
and the following error:
```
2024-09-25 09:30:08.623 ERROR Invalid path for PhpParserBin: /worker/sptestV2-/php2cpg/bin/php-parser/php-parser.php
```
    @mpollmeier
    mpollmeier committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    7ea4ed9 View commit details
    Browse the repository at this point in the history

  2. fmt

    @mpollmeier
    mpollmeier committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    def7fb8 View commit details
    Browse the repository at this point in the history

  3. toString

    @mpollmeier
    mpollmeier committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    1f18bcc View commit details
    Browse the repository at this point in the history

  4. fixup: now that we don't (artificially) use URL, we don't need to ran… 

    …domly drop initial characters
    @mpollmeier
    mpollmeier committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    a578959 View commit details
    Browse the repository at this point in the history

  5. use Path api rather than String and index fiddling

    @mpollmeier
    mpollmeier committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    098d52b View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. search in absolute path, to be 100% sure

    @mpollmeier
    mpollmeier committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    a030b60 View commit details
    Browse the repository at this point in the history

  2. whoopsie

    @mpollmeier
    mpollmeier committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    bea7e5a View commit details
    Browse the repository at this point in the history