Skip to content

Commit

Permalink
Add "www" prefix (#33)
Browse files Browse the repository at this point in the history
* Want www prefix to avoid issues in miniflux-sync.

* Remove toolchain.

* Remove internal package.

* Update GitHub workflows.

* Regen.
  • Loading branch information
revett authored Jul 26, 2024
1 parent 1f190d7 commit f3ddc69
Show file tree
Hide file tree
Showing 18 changed files with 218 additions and 157 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/codegen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Codegen

on: [push]

jobs:
build:
name: Run
runs-on: ubuntu-latest

steps:
- name: Check out code
uses: actions/checkout@v2

- name: Get Go version from go.mod
id: go-version
run: echo "version=$(./scripts/extract-go-version.sh)" >> $GITHUB_OUTPUT

- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ${{ steps.go-version.outputs.version }}

- name: Install deepmap/oapi-codegen
run: go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@latest

- name: Run go generate
run: make generate

- name: Check for changes
run: |
if ! git diff --exit-code; then
echo "Changes were detected after running go generate."Pj
exit 1
fi
26 changes: 20 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,29 @@
name: Lint
on: push
permissions:
contents: read

on: [push]

jobs:
golangci:
lint:
name: Run
runs-on: ubuntu-latest

steps:
- name: Checkout
- name: Check out code
uses: actions/checkout@v2

- name: Get Go version from go.mod
id: go-version
run: echo "version=$(./scripts/extract-go-version.sh)" >> $GITHUB_OUTPUT

- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ${{ steps.go-version.outputs.version }}

- name: Download remote configuration
run: curl -sSL https://github.com/revett/dotfiles/raw/main/.golangci.yml -o .golangci.yml

- name: Run golangci-lint
uses: golangci/golangci-lint-action@v2
with:
version: latest
config: .golangci.yml
23 changes: 15 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
name: Test
on: push
permissions:
contents: read

on: [push]

jobs:
test:
build:
name: Run
runs-on: ubuntu-latest

steps:
- name: Checkout
- name: Check out code
uses: actions/checkout@v2

- name: Get Go version from go.mod
id: go-version
run: echo "version=$(./scripts/extract-go-version.sh)" >> $GITHUB_OUTPUT

- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
- name: Test
run: go test -race -cover ./...
go-version: ${{ steps.go-version.outputs.version }}

- name: Test with coverage
run: make test
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"yaml.schemas": {
"https://json.schemastore.org/github-action.json": "file:///Users/revett/projects/github.com/revett/rss-explore/.github/workflows/codegen.yml"
}
}
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ run: generate

test:
@go test -cover ./...

update-deps:
go get -u ./...
go mod tidy
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ curl --location --silent \
```

```bash
"https://youtube.com/feeds/videos.xml?channel_id=UCWaC58KxHxyCgZVl4cRDxSg"
"https://www.youtube.com/feeds/videos.xml?channel_id=UCWaC58KxHxyCgZVl4cRDxSg"
```

## Raycast
Expand Down
2 changes: 1 addition & 1 deletion api/youtube/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/labstack/echo/v4/middleware"
commonLog "github.com/revett/common/log"
commonMiddleware "github.com/revett/common/middleware"
"github.com/revett/rss-explore/internal/handler"
"github.com/revett/rss-explore/handler"
"github.com/rs/zerolog/log"
)

Expand Down
67 changes: 38 additions & 29 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,45 +1,54 @@
module github.com/revett/rss-explore

go 1.18
go 1.21

require (
github.com/go-playground/validator/v10 v10.11.1
github.com/labstack/echo/v4 v4.10.0
github.com/revett/common v0.0.0-20220802124857-c7a14ac4f05f
github.com/rs/zerolog v1.29.0
github.com/stretchr/testify v1.8.1
google.golang.org/api v0.108.0
github.com/go-playground/validator/v10 v10.22.0
github.com/labstack/echo/v4 v4.12.0
github.com/revett/common v0.0.0-20231119155546-d99e7a5e9208
github.com/rs/zerolog v1.33.0
github.com/stretchr/testify v1.9.0
google.golang.org/api v0.189.0
)

require (
cloud.google.com/go/compute v1.14.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/auth v0.7.2 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/gabriel-vasile/mimetype v1.4.5 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
github.com/labstack/gommon v0.4.0 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
github.com/labstack/gommon v0.4.2 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.2.0 // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/time v0.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect
google.golang.org/grpc v1.51.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240722135656-d784300faade // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit f3ddc69

Please sign in to comment.