EEbus: simplify build

motze92 · Oct 20, 2022 · 8060096 · 8060096
1 parent d0b245d
commit 8060096
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -44,7 +44,7 @@ jobs:
         id: go
 
       - name: Patch ASN1
-        run: make patch-asn1-sudo
+        run: sudo make patch-asn1
 
       - name: Build
         run: make build
@@ -63,7 +63,7 @@ jobs:
         id: go
 
       - name: Patch ASN1
-        run: make patch-asn1-sudo
+        run: sudo make patch-asn1
 
       - name: Test
         run: make test

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -82,7 +82,7 @@ jobs:
         run: pip install --upgrade cloudsmith-cli
 
       - name: Patch ASN1
-        run: make patch-asn1-sudo
+        run: sudo make patch-asn1
 
       - name: Create nightly build
         uses: goreleaser/goreleaser-action@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -68,7 +68,7 @@ jobs:
         run: pip install --upgrade cloudsmith-cli
 
       - name: Patch ASN1
-        run: make patch-asn1-sudo
+        run: sudo make patch-asn1
 
       # gokrazy image
       # - name: Prepare Image

diff --git a/Makefile b/Makefile
@@ -127,12 +127,6 @@ soc::
 	go build $(BUILD_TAGS) $(BUILD_ARGS) github.com/evcc-io/evcc/cmd/soc
 
 # patch asn1.go to allow Elli buggy certificates to be accepted with EEBUS
-patch-asn1-sudo::
-	# echo $(GOROOT)
-	cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true"
-	sudo patch -N -t -d $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte -i $(CURRDIR)/patch/asn1.diff
-	cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true"
-
 patch-asn1::
 	# echo $(GOROOT)
 	cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true"