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
2 changes: 1 addition & 1 deletion .github/actions/setup-llcppg/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ runs:
shell: bash
working-directory: .llgo
run: |
go install -v ./cmd/llgo/...
go install -tags=dev -v ./cmd/llgo/...
export LLGO_ROOT=$GITHUB_WORKSPACE/.llgo
echo "LLGO_ROOT=$LLGO_ROOT" >> $GITHUB_ENV
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/end2end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- ubuntu-24.04
- ubuntu-24.04-arm
llvm: [19]
llgo: [f0728c4fe028fbc72455c1242cef638ebdf60454]
llgo: [6de3bdcdd9b3959d244e7b3b7e97fc4e3408cd78]
go: [1.23]
fail-fast: false
runs-on: ${{matrix.os}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gentest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- ubuntu-24.04
- ubuntu-24.04-arm
llvm: [19]
llgo: [f0728c4fe028fbc72455c1242cef638ebdf60454]
llgo: [6de3bdcdd9b3959d244e7b3b7e97fc4e3408cd78]
go: [1.23]
fail-fast: false
runs-on: ${{matrix.os}}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- macos-latest
- ubuntu-24.04
llvm: [19]
llgo: [f0728c4fe028fbc72455c1242cef638ebdf60454]
llgo: [6de3bdcdd9b3959d244e7b3b7e97fc4e3408cd78]
go: [1.23]
fail-fast: false
runs-on: ${{matrix.os}}
Expand All @@ -42,19 +42,19 @@ jobs:
# only can compile with llgo
- name: Test xtool
run: |
llgo test ./_xtool/internal/...
llgo test -abi=0 ./_xtool/internal/...

# only can compile with llgo
- name: Test llcppsymg & llcppsigfetch
run: |
llgo test ./_xtool/llcppsigfetch/internal/...
llgo test ./_xtool/llcppsymg/internal/...
llgo test -abi=0 ./_xtool/llcppsigfetch/internal/...
llgo test -abi=0 ./_xtool/llcppsymg/internal/...

- name: Test For LLGo and Go
run: |
llgo test ./config
llgo test ./internal/arg
llgo test ./internal/name
llgo test -abi=0 ./config
llgo test -abi=0 ./internal/arg
llgo test -abi=0 ./internal/name

- name: Test
if: ${{!startsWith(matrix.os, 'macos')}}
Expand All @@ -81,4 +81,4 @@ jobs:
echo "libdir: $libdir"
ln -s $libdir/pkgconfig/python-3.12-embed.pc $pcdir/python3-embed.pc
export PKG_CONFIG_PATH=$pcdir
bash .github/workflows/test_demo.sh
bash .github/workflows/test_demo.sh
6 changes: 3 additions & 3 deletions .github/workflows/test_demo.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#!/bin/bash
set -e

# llgo run subdirectories under _demo and _pydemo that contain *.go files
# llgo run -abi=0 subdirectories under _demo and _pydemo that contain *.go files
total=0
failed=0
failed_cases=""
for d in ./_demo/* ./_pydemo/*; do
if [ -d "$d" ] && [ -n "$(ls "$d"/*.go 2>/dev/null)" ]; then
total=$((total+1))
echo "Testing $d"
if ! (cd "$d" && llgo run .); then
if ! (go mod tidy && llgo run .); then
if ! (cd "$d" && llgo run -abi=0 .); then
if ! (go mod tidy && llgo run -abi=0 .); then
echo "FAIL"
failed=$((failed+1))
failed_cases="$failed_cases\n* :x: $d"
Expand Down
2 changes: 1 addition & 1 deletion _cmptest/llcppgend_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ func runDemos(t *testing.T, logFile *os.File, demosPath string, pkgname, pkgpath
continue
}
demoPath := filepath.Join(tempDemosPath, demo.Name())
demoCmd := command(logFile, demoPath, "llgo", "run", ".")
demoCmd := command(logFile, demoPath, "llgo", "run", "-abi=0", ".")
demoCmd.Env = append(demoCmd.Env, llgoEnv()...)
demoCmd.Env = append(demoCmd.Env, pcPathEnv(pcPath)...)
demoCmd.Env = append(demoCmd.Env, tempDirEnv(llgoRunTempDir)...)
Expand Down
2 changes: 1 addition & 1 deletion cmd/llcppgtest/demo/demo.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ func RunGenPkgDemo(demoRoot string, confDir string) error {
tempLog,
filepath.Join(demosPath, demo.Name()),
llgoRunTempDir,
"llgo", "run", "-v", ".",
"llgo", "run", "-abi=0", "-v", ".",
); demoErr != nil {
return fmt.Errorf("%s: failed to run demo: %s: %w", demoPkgName, demo.Name(), demoErr)
}
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ go 1.23.0
require (
github.com/goplus/gogen v1.19.1
github.com/goplus/lib v0.2.0
github.com/goplus/llgo v0.11.6-0.20250612045535-26aaa65c1d58
github.com/goplus/llgo v0.11.6-0.20250821034534-6de3bdcdd9b3
github.com/goplus/mod v0.17.1
github.com/qiniu/x v1.15.1
)

require golang.org/x/mod v0.25.0 // indirect
require golang.org/x/mod v0.27.0 // indirect
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ github.com/goplus/gogen v1.19.1 h1:L7jz60azeowj8zUq48tozETriTPBLqHb0nDj6PheANc=
github.com/goplus/gogen v1.19.1/go.mod h1:owX2e1EyU5WD+Nm6oH2m/GXjLdlBYcwkLO4wN8HHXZI=
github.com/goplus/lib v0.2.0 h1:AjqkN1XK5H23wZMMlpaUYAMCDAdSBQ2NMFrLtSh7W4g=
github.com/goplus/lib v0.2.0/go.mod h1:SgJv3oPqLLHCu0gcL46ejOP3x7/2ry2Jtxu7ta32kp0=
github.com/goplus/llgo v0.11.6-0.20250612045535-26aaa65c1d58 h1:q0Soyx8ym0wLaEJ/MrnERVrj/kgTJsGFqLMJoWqc6BY=
github.com/goplus/llgo v0.11.6-0.20250612045535-26aaa65c1d58/go.mod h1:blQqJ5hyxAuV7HFQCseqsNYfg/tfJu49wlmvkXLHqu0=
github.com/goplus/llgo v0.11.6-0.20250821034534-6de3bdcdd9b3 h1:2K/r3G4fGV8dsPp5XKXNBTqPsiJ2b7ng49e3jHeEyLU=
github.com/goplus/llgo v0.11.6-0.20250821034534-6de3bdcdd9b3/go.mod h1:IyNrokgi/szFv1Zcqv9nQTDIfUmoccizneyIXstqv2Y=
github.com/goplus/mod v0.17.1 h1:ITovxDcc5zbURV/Wrp3/SBsYLgC1KrxY6pq1zMM2V94=
github.com/goplus/mod v0.17.1/go.mod h1:iXEszBKqi38BAyQApBPyQeurLHmQN34YMgC2ZNdap50=
github.com/qiniu/x v1.15.1 h1:avE+YQaowp8ZExjylOeSM73rUo3MQKBAYVxh4NJ8dY8=
github.com/qiniu/x v1.15.1/go.mod h1:AiovSOCaRijaf3fj+0CBOpR1457pn24b0Vdb1JpwhII=
golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
4 changes: 2 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ go install -v ./cmd/llcppcfg
go install -v ./cmd/llcppgtest

# main process required
llgo install ./_xtool/llcppsymg
llgo install ./_xtool/llcppsigfetch
llgo install -abi=0 ./_xtool/llcppsymg
llgo install -abi=0 ./_xtool/llcppsigfetch
go install -v ./cmd/gogensig
go install -v ./cmd/llcppg
Loading