From 7b70e95e9c5f37e5318e53c3c40677d96529dd3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=98=83=20pitr?= Date: Sun, 31 Dec 2023 17:25:30 +0100 Subject: [PATCH] move module to pitr.ca/fj --- .github/workflows/main.yml | 16 ++++------------ .goreleaser.yaml | 8 ++++++++ README.md | 4 ++-- flatten.go | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d40ac6c..1f457d1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,17 +22,9 @@ jobs: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: - go-version: 1.16 - - - name: Cache Go modules - uses: actions/cache@v1 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go- + go-version: 1.21 - name: Tests run: | @@ -40,10 +32,10 @@ jobs: go test -v ./... - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v2 + uses: goreleaser/goreleaser-action@v5 if: success() && startsWith(github.ref, 'refs/tags/') with: version: latest - args: release --rm-dist + args: release --clean env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.goreleaser.yaml b/.goreleaser.yaml index d439af5..67b6eb4 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -11,3 +11,11 @@ builds: - amd64 - arm - arm64 + goarm: + - 6 + - 7 + ignore: + - goos: darwin + goarch: 386 + - goos: darwin + goarch: arm diff --git a/README.md b/README.md index b01d9e8..bc3bb13 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ fj can un-flatten too, which is useful to get a subset of JSON: Alternatively, if you have Go compiler: ``` -❯ go install github.com/pitr/fj@latest # OR -❯ go get -u github.com/pitr/fj # legacy way +❯ go install pitr.ca/fj@latest # OR +❯ go get -u pitr.ca/fj # legacy way ``` ## Usage diff --git a/flatten.go b/flatten.go index c49b073..2ef0723 100644 --- a/flatten.go +++ b/flatten.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - json "github.com/pitr/jsontokenizer" "github.com/valyala/bytebufferpool" + json "pitr.ca/jsontokenizer" ) var ( diff --git a/go.mod b/go.mod index d0053ff..1f97a0c 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ -module github.com/pitr/fj +module pitr.ca/fj go 1.16 require ( github.com/matryer/is v1.4.0 - github.com/pitr/jsontokenizer v0.2.0 github.com/valyala/bytebufferpool v1.0.0 + pitr.ca/jsontokenizer v0.3.0 ) diff --git a/go.sum b/go.sum index 8d46b9c..7b0684b 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= -github.com/pitr/jsontokenizer v0.2.0 h1:P0Wtw2aYDOVDmaFjRjOKxMl73R0QxEAWYwli+kd7f/M= -github.com/pitr/jsontokenizer v0.2.0/go.mod h1:KATI4UQwEA2a5MjKoszKlyZjcQZHY2DARFx01kRgUFY= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +pitr.ca/jsontokenizer v0.3.0 h1:Qr70hk4/wcpFEgu/6aJ+nvYQ6x/xS0WOkC627ceiI/M= +pitr.ca/jsontokenizer v0.3.0/go.mod h1:3DJdA2QNOU6cI0XkH6pRKZ4Oe8G5SDRUQ6PFAwaQ3YY=