diff --git a/.github/actions/lfs/action.yml b/.github/actions/lfs/action.yml deleted file mode 100644 index 062ae967..00000000 --- a/.github/actions/lfs/action.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Git LFS pull -description: Cached Git LFS pull. - -runs: - using: "composite" - steps: - - name: Create LFS file list - shell: bash - run: git lfs ls-files --long | cut -d ' ' -f1 | sort > .lfs-assets-id - - - name: Restore LFS cache - uses: actions/cache@v4 - with: - path: .git/lfs/objects - key: lfs-${{ hashFiles('.lfs-assets-id') }} - restore-keys: lfs- - enableCrossOsArchive: true - - - name: Git LFS pull - shell: bash - run: | - git lfs pull - git lfs prune \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d3d3b82a..530c6dc5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,9 +29,6 @@ jobs: - uses: actions/setup-go@v5 with: { go-version: stable } - - name: Git LFS pull - uses: ./.github/actions/lfs - - name: Format run: gofmt -s -w . && git diff --exit-code if: matrix.os != 'windows-latest' @@ -104,9 +101,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Git LFS pull - uses: ./.github/actions/lfs - - name: Build env: GOOS: ${{ matrix.os.name }} @@ -142,9 +136,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Git LFS pull - uses: ./.github/actions/lfs - - name: Build env: GOOS: ${{ matrix.os.name }} @@ -170,9 +161,6 @@ jobs: - uses: actions/setup-go@v5 with: { go-version: stable } - - name: Git LFS pull - uses: ./.github/actions/lfs - - name: Test 386 (32-bit) run: GOARCH=386 go test -v -short ./... @@ -197,8 +185,5 @@ jobs: - uses: actions/setup-go@v5 with: { go-version: stable } - - name: Git LFS pull - uses: ./.github/actions/lfs - - name: Test run: go test -v ./... diff --git a/sqlite3/download.sh b/sqlite3/download.sh index de50a3ba..48bb1d88 100755 --- a/sqlite3/download.sh +++ b/sqlite3/download.sh @@ -32,7 +32,6 @@ curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/ext/misc/uint.c" cd ~- cd ../vfs/tests/mptest/testdata/ -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/mptest/mptest.c" curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/mptest/config01.test" curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/mptest/config02.test" curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/mptest/crash01.test" @@ -40,6 +39,10 @@ curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/mptest/crash02.su curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/mptest/multiwrite01.test" cd ~- -cd ../vfs/tests/speedtest1/testdata/ +cd ../vfs/tests/mptest/wasm/ +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/mptest/mptest.c" +cd ~- + +cd ../vfs/tests/speedtest1/wasm/ curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/test/speedtest1.c" cd ~- \ No newline at end of file diff --git a/vfs/tests/mptest/mptest_test.go b/vfs/tests/mptest/mptest_test.go index 76f27694..c6108781 100644 --- a/vfs/tests/mptest/mptest_test.go +++ b/vfs/tests/mptest/mptest_test.go @@ -2,7 +2,6 @@ package mptest import ( "bytes" - "compress/bzip2" "context" "crypto/rand" "embed" @@ -29,10 +28,7 @@ import ( _ "github.com/ncruces/go-sqlite3/vfs/xts" ) -//go:embed testdata/mptest.wasm.bz2 -var compressed string - -//go:embed testdata/*.*test +//go:embed testdata/* var scripts embed.FS const qemuCI = runtime.GOARCH != "386" && runtime.GOARCH != "amd64" && runtime.GOARCH != "arm64" @@ -57,10 +53,7 @@ func TestMain(m *testing.M) { panic(err) } - if !strings.HasPrefix(compressed, "BZh") { - panic("Please use Git LFS to clone this repo: https://git-lfs.com/") - } - binary, err := io.ReadAll(bzip2.NewReader(strings.NewReader(compressed))) + binary, err := os.ReadFile("wasm/mptest.wasm") if err != nil { panic(err) } diff --git a/vfs/tests/mptest/testdata/.gitattributes b/vfs/tests/mptest/testdata/.gitattributes index 3473a26f..d7c444cb 100644 --- a/vfs/tests/mptest/testdata/.gitattributes +++ b/vfs/tests/mptest/testdata/.gitattributes @@ -1,2 +1 @@ -mptest.wasm.bz2 filter=lfs diff=lfs merge=lfs -text -*.*test -crlf \ No newline at end of file +* -crlf \ No newline at end of file diff --git a/vfs/tests/mptest/testdata/mptest.wasm.bz2 b/vfs/tests/mptest/testdata/mptest.wasm.bz2 deleted file mode 100644 index 117d0939..00000000 --- a/vfs/tests/mptest/testdata/mptest.wasm.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e20f37d94223a88d8f94b3a20177c0fbf53392df2f9c59a28cc7f1f2b5d3de81 -size 477370 diff --git a/vfs/tests/mptest/testdata/.gitignore b/vfs/tests/mptest/wasm/.gitignore similarity index 100% rename from vfs/tests/mptest/testdata/.gitignore rename to vfs/tests/mptest/wasm/.gitignore diff --git a/vfs/tests/mptest/testdata/build.sh b/vfs/tests/mptest/wasm/build.sh similarity index 95% rename from vfs/tests/mptest/testdata/build.sh rename to vfs/tests/mptest/wasm/build.sh index 58b8f894..4b2eff70 100755 --- a/vfs/tests/mptest/testdata/build.sh +++ b/vfs/tests/mptest/wasm/build.sh @@ -30,5 +30,4 @@ WASI_SDK="$ROOT/tools/wasi-sdk/bin" --enable-simd --enable-mutable-globals --enable-multivalue \ --enable-bulk-memory --enable-reference-types \ --enable-nontrapping-float-to-int --enable-sign-ext -mv mptest.tmp mptest.wasm -bzip2 -9f mptest.wasm \ No newline at end of file +mv mptest.tmp mptest.wasm \ No newline at end of file diff --git a/vfs/tests/mptest/testdata/exports.txt b/vfs/tests/mptest/wasm/exports.txt similarity index 100% rename from vfs/tests/mptest/testdata/exports.txt rename to vfs/tests/mptest/wasm/exports.txt diff --git a/vfs/tests/mptest/wasm/go.mod b/vfs/tests/mptest/wasm/go.mod new file mode 100644 index 00000000..e69de29b diff --git a/vfs/tests/mptest/testdata/main.c b/vfs/tests/mptest/wasm/main.c similarity index 100% rename from vfs/tests/mptest/testdata/main.c rename to vfs/tests/mptest/wasm/main.c diff --git a/vfs/tests/mptest/wasm/mptest.wasm b/vfs/tests/mptest/wasm/mptest.wasm new file mode 100644 index 00000000..53870c8e Binary files /dev/null and b/vfs/tests/mptest/wasm/mptest.wasm differ diff --git a/vfs/tests/speedtest1/speedtest1_test.go b/vfs/tests/speedtest1/speedtest1_test.go index 233ea44f..8416d603 100644 --- a/vfs/tests/speedtest1/speedtest1_test.go +++ b/vfs/tests/speedtest1/speedtest1_test.go @@ -2,7 +2,6 @@ package speedtest1 import ( "bytes" - "compress/bzip2" "context" "crypto/rand" _ "embed" @@ -27,9 +26,6 @@ import ( _ "github.com/ncruces/go-sqlite3/vfs/xts" ) -//go:embed testdata/speedtest1.wasm.bz2 -var compressed string - var ( rt wazero.Runtime module wazero.CompiledModule @@ -52,10 +48,7 @@ func TestMain(m *testing.M) { panic(err) } - if !strings.HasPrefix(compressed, "BZh") { - panic("Please use Git LFS to clone this repo: https://git-lfs.com/") - } - binary, err := io.ReadAll(bzip2.NewReader(strings.NewReader(compressed))) + binary, err := os.ReadFile("wasm/speedtest1.wasm") if err != nil { panic(err) } diff --git a/vfs/tests/speedtest1/testdata/.gitattributes b/vfs/tests/speedtest1/testdata/.gitattributes deleted file mode 100644 index af895aab..00000000 --- a/vfs/tests/speedtest1/testdata/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -speedtest1.wasm.bz2 filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/vfs/tests/speedtest1/testdata/speedtest1.wasm.bz2 b/vfs/tests/speedtest1/testdata/speedtest1.wasm.bz2 deleted file mode 100644 index 5cde8363..00000000 --- a/vfs/tests/speedtest1/testdata/speedtest1.wasm.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eebe395695c739a24e9cded13553b97d232eb268a5bc36f10f27cc13945e78cd -size 491003 diff --git a/vfs/tests/speedtest1/testdata/.gitignore b/vfs/tests/speedtest1/wasm/.gitignore similarity index 100% rename from vfs/tests/speedtest1/testdata/.gitignore rename to vfs/tests/speedtest1/wasm/.gitignore diff --git a/vfs/tests/speedtest1/testdata/build.sh b/vfs/tests/speedtest1/wasm/build.sh similarity index 93% rename from vfs/tests/speedtest1/testdata/build.sh rename to vfs/tests/speedtest1/wasm/build.sh index d5bebe92..9189008a 100755 --- a/vfs/tests/speedtest1/testdata/build.sh +++ b/vfs/tests/speedtest1/wasm/build.sh @@ -25,5 +25,4 @@ WASI_SDK="$ROOT/tools/wasi-sdk/bin" --enable-simd --enable-mutable-globals --enable-multivalue \ --enable-bulk-memory --enable-reference-types \ --enable-nontrapping-float-to-int --enable-sign-ext -mv speedtest1.tmp speedtest1.wasm -bzip2 -9f speedtest1.wasm \ No newline at end of file +mv speedtest1.tmp speedtest1.wasm \ No newline at end of file diff --git a/vfs/tests/speedtest1/testdata/exports.txt b/vfs/tests/speedtest1/wasm/exports.txt similarity index 100% rename from vfs/tests/speedtest1/testdata/exports.txt rename to vfs/tests/speedtest1/wasm/exports.txt diff --git a/vfs/tests/speedtest1/wasm/go.mod b/vfs/tests/speedtest1/wasm/go.mod new file mode 100644 index 00000000..e69de29b diff --git a/vfs/tests/speedtest1/testdata/main.c b/vfs/tests/speedtest1/wasm/main.c similarity index 100% rename from vfs/tests/speedtest1/testdata/main.c rename to vfs/tests/speedtest1/wasm/main.c diff --git a/vfs/tests/speedtest1/wasm/speedtest1.wasm b/vfs/tests/speedtest1/wasm/speedtest1.wasm new file mode 100644 index 00000000..d375efcd Binary files /dev/null and b/vfs/tests/speedtest1/wasm/speedtest1.wasm differ