Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 25 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,19 @@ jobs:
if: runner.os != 'Windows'
run: scripts/ci/install_agent_clis.sh

- name: Fix SQLite test file permissions (proactive)
if: runner.os != 'Windows'
run: |
# Download dependencies first to ensure SQLite module is cached
go mod download
# Fix permissions on SQLite test files in go module cache
for sqlite_dir in "$HOME/.ci-tmp-home/go/pkg/mod/modernc.org/sqlite@"*; do
if [ -d "$sqlite_dir" ]; then
find "$sqlite_dir" -type f -exec chmod 644 {} + 2>/dev/null || true
find "$sqlite_dir" -type d -exec chmod 755 {} + 2>/dev/null || true
fi
done

- name: Test (with coverage on ubuntu)
if: matrix.os == 'ubuntu-latest'
run: go test ./... -coverprofile=coverage.out -covermode=atomic
Expand All @@ -48,7 +61,18 @@ jobs:
if: matrix.os != 'ubuntu-latest'
run: go test ./...

- name: PTY integration tests
- name: Fix SQLite test file permissions (cleanup)
if: always() && runner.os != 'Windows'
run: |
# Fix permissions on SQLite test files in go module cache
for sqlite_dir in "$HOME/.ci-tmp-home/go/pkg/mod/modernc.org/sqlite@"*; do
if [ -d "$sqlite_dir" ]; then
find "$sqlite_dir" -type f -exec chmod 644 {} + 2>/dev/null || true
find "$sqlite_dir" -type d -exec chmod 755 {} + 2>/dev/null || true
fi
done

- name: PTY-integration tests
if: runner.os != 'Windows'
run: go test ./... -run TestPTY -count=1

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/creack/pty v1.1.24
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/mitchellh/go-homedir v1.1.0
golang.org/x/mod v0.31.0
golang.org/x/mod v0.33.0
golang.org/x/term v0.40.0
modernc.org/sqlite v1.40.1
)
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavM
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o=
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8=
golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
modernc.org/cc/v4 v4.26.5 h1:xM3bX7Mve6G8K8b+T11ReenJOT+BmVqQj0FY5T4+5Y4=
modernc.org/cc/v4 v4.26.5/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
modernc.org/ccgo/v4 v4.28.1 h1:wPKYn5EC/mYTqBO373jKjvX2n+3+aK7+sICCv4Fjy1A=
Expand Down
5 changes: 3 additions & 2 deletions scripts/ci/agent_cli_smoke.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ export HOME="$tmp_home"
echo
echo "Using HOME=$HOME"

go run ./cmd/ackchyually shim install git

echo
echo "Integrate status (before):"
go run ./cmd/ackchyually integrate status
Expand All @@ -30,6 +28,9 @@ echo
echo "Integrate status (after):"
go run ./cmd/ackchyually integrate status

# Install git shim after integration to avoid temp dir issues
go run ./cmd/ackchyually shim install git

echo
echo "Verify:"
go run ./cmd/ackchyually integrate verify all
Loading