ci: fix CD

.github/workflows/cd.yml

@@ -18,10 +18,6 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: '1.15'
-      - name: Install xcaddy
-        env:
-          GO111MODULE: "off"
-        run: go get -u github.com/caddyserver/xcaddy/cmd/xcaddy
       - name: Docker Hub Login
         run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
         env:
@@ -35,7 +31,3 @@ jobs:
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      -
-        name: Pull new module version
-        uses: andrewslotin/go-proxy-pull-action@master

.gitignore

@@ -2,7 +2,6 @@
 *.pyc
 __pycache__
 vendor
-buildenv*
 /caddy/caddy
 /certs
 /dist

.goreleaser.yml

@@ -1,7 +1,7 @@
 before:
   hooks:
-  # Create a Caddy skeleton containing the module
-  - make prepare
+  - go mod download
+  - cd caddy && go mod download
 checksum:
   name_template: 'checksums.txt'
 snapshot:
@@ -18,8 +18,7 @@ env:
   - CGO_ENABLED=0
 builds:
 - id: caddy
-  dir: caddy/buildenv
-  binary: mercure
+  dir: caddy/mercure
   goos:
     - linux
     - darwin

CONTRIBUTING.md

@@ -47,25 +47,15 @@ To run the test suite:
 
 To test the Caddy module:
 
-    $ cd caddy
-    $ xcaddy run
+    $ cd caddy/mercure
+    $ go run main.go
 
-Or to build the module:
+Go to `http://localhost` and enjoy!
 
-    $ xcaddy build --with github.com/dunglas/mercure=../../ --with github.com/dunglas/mercure/caddy=../
-
-To test the legacy server, install Gin for Live Reloading:
-
-    $ go get github.com/codegangsta/gin
-
-Install the dependencies:
+To test the legacy server:
 
     $ cd cmd/mercure
-    $ go get
-
-Run the server:
-
-    $ gin
+    $ go go run main.go
 
 Go to `http://localhost:3000` and enjoy!
 

caddy/go.mod

@@ -2,48 +2,38 @@ module github.com/dunglas/mercure/caddy
 
 go 1.15
 
+replace github.com/dunglas/mercure => ../
+
 require (
 	github.com/Masterminds/semver/v3 v3.1.1 // indirect
-	github.com/antlr/antlr4 v0.0.0-20201029161626-9a95f0cc3d7c // indirect
+	github.com/alecthomas/chroma v0.8.2 // indirect
+	github.com/antlr/antlr4 v0.0.0-20201124223952-86610fd4b43e // indirect
 	github.com/caddyserver/caddy/v2 v2.2.1
 	github.com/dgraph-io/badger v1.6.2 // indirect
 	github.com/dgraph-io/badger/v2 v2.2007.2 // indirect
-	github.com/dunglas/mercure v0.10.4
+	github.com/dlclark/regexp2 v1.4.0 // indirect
+	github.com/dunglas/mercure v0.10.5-0.20201125135044-f24ebaef0b26
 	github.com/golang/snappy v0.0.2 // indirect
 	github.com/google/cel-go v0.6.0 // indirect
-	github.com/gorilla/handlers v1.5.1 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/imdario/mergo v0.3.11 // indirect
+	github.com/klauspost/compress v1.11.3 // indirect
 	github.com/klauspost/cpuid v1.3.1 // indirect
 	github.com/lucas-clemente/quic-go v0.19.2 // indirect
-	github.com/magiconair/properties v1.8.4 // indirect
 	github.com/manifoldco/promptui v0.8.0 // indirect
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/miekg/dns v1.1.35 // indirect
-	github.com/mitchellh/mapstructure v1.3.3 // indirect
 	github.com/mitchellh/reflectwalk v1.0.1 // indirect
-	github.com/pelletier/go-toml v1.8.1 // indirect
 	github.com/prometheus/client_golang v1.8.0
-	github.com/prometheus/common v0.15.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sirupsen/logrus v1.7.0 // indirect
 	github.com/smallstep/certificates v0.15.5 // indirect
 	github.com/smallstep/nosql v0.3.2 // indirect
-	github.com/spf13/afero v1.4.1 // indirect
-	github.com/spf13/cobra v1.1.1 // indirect
-	github.com/spf13/viper v1.7.1 // indirect
 	github.com/stretchr/testify v1.6.1
 	github.com/urfave/cli v1.22.5 // indirect
 	go.step.sm/crypto v0.7.1 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.16.0
-	golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 // indirect
-	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
-	golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 // indirect
-	golang.org/x/text v0.3.4 // indirect
 	google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4 // indirect
 	google.golang.org/grpc v1.33.2 // indirect
-	gopkg.in/ini.v1 v1.62.0 // indirect
 	howett.net/plist v0.0.0-20201026045517-117a925f2150 // indirect
 )