diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index e0af726..01d1509 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -9,13 +9,12 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v6 with: - go-version: 1.21 - stable: false + go-version: latest - name: Build run: bash fuzz.sh diff --git a/.github/workflows/gen_docs.yml b/.github/workflows/gen_docs.yml index 6794818..9b8f6f2 100644 --- a/.github/workflows/gen_docs.yml +++ b/.github/workflows/gen_docs.yml @@ -8,13 +8,12 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v6 with: - go-version: 1.18.0-beta2 - stable: false + go-version: latest - name: Generate run: | diff --git a/.github/workflows/go1.19.yml b/.github/workflows/go.yml similarity index 54% rename from .github/workflows/go1.19.yml rename to .github/workflows/go.yml index 3e635f2..827a46d 100644 --- a/.github/workflows/go1.19.yml +++ b/.github/workflows/go.yml @@ -1,4 +1,4 @@ -name: Go 1.19 +name: Go (1.21-1.25) on: push: @@ -10,13 +10,16 @@ jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + go-version: ['1.21', '1.22', '1.23', '1.24', '1.25'] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v6 with: - go-version: '1.19' + go-version: ${{ matrix.go-version }} - name: Build run: go build -v ./... diff --git a/.github/workflows/go1.20.yml b/.github/workflows/go1.20.yml deleted file mode 100644 index febc4be..0000000 --- a/.github/workflows/go1.20.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Go 1.20 - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: '1.20' - - - name: Build - run: go build -v ./... - - - name: Test - run: go test --race ./... diff --git a/.github/workflows/go1.21.yml b/.github/workflows/go1.21.yml deleted file mode 100644 index b68406e..0000000 --- a/.github/workflows/go1.21.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Go 1.21 - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: '1.21' - - - name: Build - run: go build -v ./... - - - name: Test - run: go test --race ./... diff --git a/.github/workflows/go1.22.yml b/.github/workflows/go1.22.yml deleted file mode 100644 index 6354f8a..0000000 --- a/.github/workflows/go1.22.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Go 1.22 - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: '1.22' - - - name: Build - run: go build -v ./... - - - name: Test - run: go test --race ./... diff --git a/.github/workflows/go1.23.yml b/.github/workflows/go1.23.yml deleted file mode 100644 index cddded1..0000000 --- a/.github/workflows/go1.23.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Go 1.23 - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: '1.23' - - - name: Build - run: go build -v ./... - - - name: Test - run: go test --race ./... diff --git a/.github/workflows/go1.24.yml b/.github/workflows/go1.24.yml deleted file mode 100644 index bc868e2..0000000 --- a/.github/workflows/go1.24.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Go 1.24 - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: '1.24' - - - name: Build - run: go build -v ./... - - - name: Test - run: go test --race ./... diff --git a/go.mod b/go.mod index b14a81b..fd6132e 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/bradenaw/juniper -go 1.18 +go 1.21.0 require ( - golang.org/x/exp v0.0.0-20231006140011-7918f672742d - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 + golang.org/x/sync v0.11.0 ) diff --git a/go.sum b/go.sum index 038a993..ff929c4 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ -golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= -golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= diff --git a/test_all_versions.sh b/test_all_versions.sh index bb8ed57..37d2247 100644 --- a/test_all_versions.sh +++ b/test_all_versions.sh @@ -2,7 +2,7 @@ set -euo pipefail -go_versions=(1.21.9 1.22.9 1.23.6 1.24.0) +go_versions=(1.21.9 1.22.9 1.23.6 1.24.0 1.25.0) latest="${go_versions[-1]}" if ! go version | grep "go$latest" > /dev/null; then