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

Prevent breakage when merging OSS changes to ENT due to missing funcs #21564

Merged
merged 12 commits into from
Jul 6, 2023
Merged

Prevent breakage when merging OSS changes to ENT due to missing funcs #21564

merged 12 commits into from
Jul 6, 2023

Commits on Jul 4, 2023

  1. Add a go:generate helper called stubmaker, which generates appropriat… 

    …e stubs on oss, and also on ent if the real func hasn't yet been defined.
    @ncabatoff
    ncabatoff committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    17e011e View commit details
    Browse the repository at this point in the history

  2. Some cleanup, plus add copyright lines and generated message to outputs.

    @ncabatoff
    ncabatoff committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    fb571ca View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. Fix rm

    @ncabatoff
    ncabatoff committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    0290d7b View commit details
    Browse the repository at this point in the history

  2. Test new stub

    @ncabatoff
    ncabatoff committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    e7c3ee4 View commit details
    Browse the repository at this point in the history

  3. New approach, basically just copy and munge the input stubs file.

    @ncabatoff
    ncabatoff committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    5befd1c View commit details
    Browse the repository at this point in the history

  4. Cleanup

    @ncabatoff
    ncabatoff committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    7c7f395 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into stubmaker 

    # Conflicts:
#	go.mod
#	go.sum
    @ncabatoff
    ncabatoff committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    13b2215 View commit details
    Browse the repository at this point in the history

  6. go mod tidy

    @ncabatoff
    ncabatoff committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    4b7e3c3 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Add protections to ensure we don't clobber any files that are tracked… 

    … by Git in any way
    @ncabatoff
    ncabatoff committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    9a6439d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into stubmaker

    @ncabatoff
    ncabatoff committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    1c9f09e View commit details
    Browse the repository at this point in the history

  3. Add a go generate ./... to make ci-build

    @ncabatoff
    ncabatoff committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    cce460b View commit details
    Browse the repository at this point in the history

  4. Use local GOOS/GOARCH for go run invoked via go generate.

    @ncabatoff
    ncabatoff committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    9ed68c3 View commit details
    Browse the repository at this point in the history