From d8ca15494de87d833528a02d2872fb20f160c75b Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Wed, 12 Jun 2024 21:10:01 -0400 Subject: [PATCH] attempt to fix the mess made by doing a major release --- .github/workflows/armtests.yml | 2 +- .github/workflows/basictests.yml | 4 ++-- .github/workflows/bigendiantests.yml | 4 ++-- .github/workflows/legacytests.yml | 4 ++-- .github/workflows/macostests.yml | 4 ++-- .github/workflows/windowstests.yml | 4 ++-- byte_input_test.go | 2 +- go.mod | 1 + go.sum | 2 ++ roaring.go | 2 +- roaring64/roaring64.go | 2 +- roaringarray.go | 2 +- 12 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/workflows/armtests.yml b/.github/workflows/armtests.yml index a02ce7e2..4ef8a3f0 100644 --- a/.github/workflows/armtests.yml +++ b/.github/workflows/armtests.yml @@ -16,7 +16,7 @@ jobs: with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Test run: | GOARCH=arm go build diff --git a/.github/workflows/basictests.yml b/.github/workflows/basictests.yml index 5c6a5d94..b8087ce2 100644 --- a/.github/workflows/basictests.yml +++ b/.github/workflows/basictests.yml @@ -12,11 +12,11 @@ jobs: runs-on: ${{ matrix.platform }} steps: - name: Install Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Test run: | go build -tags appengine diff --git a/.github/workflows/bigendiantests.yml b/.github/workflows/bigendiantests.yml index 4c4d9415..9b81a679 100644 --- a/.github/workflows/bigendiantests.yml +++ b/.github/workflows/bigendiantests.yml @@ -12,11 +12,11 @@ jobs: runs-on: ${{ matrix.platform }} steps: - name: Install Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Test run: | sudo apt-get update diff --git a/.github/workflows/legacytests.yml b/.github/workflows/legacytests.yml index 874b53fd..2578f438 100644 --- a/.github/workflows/legacytests.yml +++ b/.github/workflows/legacytests.yml @@ -12,11 +12,11 @@ jobs: runs-on: ${{ matrix.platform }} steps: - name: Install Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Test run: | GOARCH=386 go build ./roaring64 diff --git a/.github/workflows/macostests.yml b/.github/workflows/macostests.yml index 10e74ec3..6094f460 100644 --- a/.github/workflows/macostests.yml +++ b/.github/workflows/macostests.yml @@ -12,11 +12,11 @@ jobs: runs-on: ${{ matrix.platform }} steps: - name: Install Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Test run: | go build -tags appengine diff --git a/.github/workflows/windowstests.yml b/.github/workflows/windowstests.yml index 30ea614d..62d4293d 100644 --- a/.github/workflows/windowstests.yml +++ b/.github/workflows/windowstests.yml @@ -12,11 +12,11 @@ jobs: runs-on: ${{ matrix.platform }} steps: - name: Install Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Test run: | go build -tags appengine diff --git a/byte_input_test.go b/byte_input_test.go index c4407f19..12c64eee 100644 --- a/byte_input_test.go +++ b/byte_input_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/RoaringBitmap/roaring/internal" + "github.com/RoaringBitmap/roaring/v2/internal" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/go.mod b/go.mod index 2602690f..a9c5983f 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/RoaringBitmap/roaring/v2 go 1.14 require ( + github.com/RoaringBitmap/roaring v1.9.4 github.com/bits-and-blooms/bitset v1.12.0 github.com/mschoch/smat v0.2.0 github.com/stretchr/testify v1.7.0 diff --git a/go.sum b/go.sum index 9d4dc8aa..2fe5cba2 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +github.com/RoaringBitmap/roaring v1.9.4 h1:yhEIoH4YezLYT04s1nHehNO64EKFTop/wBhxv2QzDdQ= +github.com/RoaringBitmap/roaring v1.9.4/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90= github.com/bits-and-blooms/bitset v1.12.0 h1:U/q1fAF7xXRhFCrhROzIfffYnu+dlS38vCZtmFVPHmA= github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= diff --git a/roaring.go b/roaring.go index d156eb24..c7a91f16 100644 --- a/roaring.go +++ b/roaring.go @@ -12,7 +12,7 @@ import ( "io" "strconv" - "github.com/RoaringBitmap/roaring/internal" + "github.com/RoaringBitmap/roaring/v2/internal" "github.com/bits-and-blooms/bitset" ) diff --git a/roaring64/roaring64.go b/roaring64/roaring64.go index 56b9e30e..0584f071 100644 --- a/roaring64/roaring64.go +++ b/roaring64/roaring64.go @@ -9,7 +9,7 @@ import ( "strconv" "github.com/RoaringBitmap/roaring" - "github.com/RoaringBitmap/roaring/internal" + "github.com/RoaringBitmap/roaring/v2/internal" ) const serialCookieNoRunContainer = 12346 // only arrays and bitmaps diff --git a/roaringarray.go b/roaringarray.go index c2374ad6..552c61ce 100644 --- a/roaringarray.go +++ b/roaringarray.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/RoaringBitmap/roaring/internal" + "github.com/RoaringBitmap/roaring/v2/internal" ) type container interface {