Skip to content

feat: try to fix unstaged files workflow bug #249

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: try to fix unstaged files workflow bug #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/workflow-executor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ jobs:
- id: run-workflow
name: Run Generation Workflow
if: ${{ steps.check-label.outputs.short_circuit_label_trigger != 'true' }}
uses: speakeasy-api/sdk-generation-action@v15
uses: speakeasy-api/sdk-generation-action@v15.51
with:
speakeasy_version: ${{ inputs.speakeasy_version }}
github_access_token: ${{ secrets.github_access_token }}
Expand Down
3 changes: 2 additions & 1 deletion action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,14 @@ outputs:
description: "The release tag used for standalone ts mcp binaries"
runs:
using: "docker"
image: "docker://ghcr.io/speakeasy-api/sdk-generation-action:v15"
image: "docker://ghcr.io/speakeasy-api/sdk-generation-action:v15.51"
env:
SPEAKEASY_API_KEY: ${{ inputs.speakeasy_api_key }}
SPEAKEASY_SERVER_URL: ${{ inputs.speakeasy_server_url }}
OPENAI_API_KEY: ${{ inputs.openai_api_key }}
OPENAPI_DOC_AUTH_TOKEN: ${{ inputs.openapi_doc_auth_token }}
PR_CREATION_PAT: ${{ inputs.pr_creation_pat }}
INPUT_DEBUG: "true"
args:
- ${{ inputs.speakeasy_version }}
- ${{ inputs.github_access_token }}
Expand Down
8 changes: 8 additions & 0 deletions internal/git/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,14 @@ func (g *Git) createAndPushTree(ref *github.Reference, sourceFiles git.Status) (
}

func (g *Git) Add(arg string) error {
// Ensure we remove deleted files from index first
cleanup := exec.Command("bash", "-c", "git ls-files --deleted -z | xargs -0 git rm --cached --ignore-unmatch")
cleanup.Dir = filepath.Join(environment.GetWorkspace(), "repo", environment.GetWorkingDirectory())
cleanup.Env = os.Environ()
if out, err := cleanup.CombinedOutput(); err != nil {
logging.Debug("Cleanup of deleted files failed (non-fatal): %s", string(out))
}

// We execute this manually because go-git doesn't properly support gitignore
cmd := exec.Command("git", "add", "--renormalize", arg)
cmd.Dir = filepath.Join(environment.GetWorkspace(), "repo", environment.GetWorkingDirectory())
Expand Down
Loading