Merge pull request #815 from pastelnetwork/revert-811-veermeer-test

Revert "Manage libwebp internally through static linking"

Author: mateeullahmalik

.circleci/config.yml

@@ -21,9 +21,9 @@ commands:
           name: Install Go
           command: |
             cd ..
-            wget https://golang.org/dl/go1.22.1.linux-amd64.tar.gz
+            wget https://golang.org/dl/go1.22.0.linux-amd64.tar.gz
             sudo rm -r /usr/local/go
-            sudo tar -C /usr/local -xzf go1.22.1.linux-amd64.tar.gz
+            sudo tar -C /usr/local -xzf go1.22.0.linux-amd64.tar.gz
             echo 'export PATH=$PATH:/usr/local/go/bin:~/go/bin' >> ~/.bashrc
             echo 'export CGO_ENABLED=1' >> ~/.bashrc
             echo "export GOPATH=\"$HOME/go\"" >> ~/.bashrc
@@ -55,6 +55,17 @@ commands:
           working_directory: ~/<< parameters.path >>/<< parameters.package >>
           command: |
             ls
+           # diff -u <(echo -n) <(gofmt -d -e .)
+     # - run:
+      #    name: "<< parameters.package >>: Run go vet"
+       #   working_directory: ~/<< parameters.path >>/<< parameters.package >>
+        #  command: |
+         #   go vet -v ./...
+      #- run:
+       #   name: "<< parameters.package >>: Run revive"
+        #  working_directory: ~/<< parameters.path >>/<< parameters.package >>
+         # command: |
+          #  revive -config ~/<< parameters.path >>/.circleci/revive.toml ./...
       - run:
           name: "<< parameters.package >>: Run staticcheck"
           working_directory: ~/<< parameters.path >>/<< parameters.package >>
@@ -120,14 +131,16 @@ commands:
               APP_VERSION="latest"
             fi
 
-            export APP_LDFLAGS="-linkmode external -extldflags "-static" -s -w -X github.com/pastelnetwork/gonode/common/version.version=$APP_VERSION" 
+            export APP_LDFLAGS="-X github.com/pastelnetwork/gonode/common/version.version=$APP_VERSION" 
             echo "APP_VERSION=$APP_VERSION"
             echo "APP_LDFLAGS=$APP_LDFLAGS"
 
             if [[ "<< parameters.targets >>" == *"linux/amd64"* ]]; then
               echo "Building << parameters.package >> for Linux"
+              sudo apt-get update
+              sudo apt-get install -y libwebp-dev
               cd << parameters.package >>
-              CGO_ENABLED=1 GOOS=linux CC=musl-gcc GOARCH=amd64 go build -o $LINUX_ARTIFACT -ldflags "$APP_LDFLAGS"
+              GOOS=linux GOARCH=amd64 go build -o $LINUX_ARTIFACT -ldflags "$APP_LDFLAGS"
               echo "Done Building << parameters.package >> for Linux"
               cd ..
             fi
@@ -273,16 +286,6 @@ commands:
             make check
             sudo make install
             sudo /sbin/ldconfig -v
-  instal_musl:
-    steps:
-      - run:
-          name: Install Musl
-          command: |
-            sudo apt-get update
-            sudo apt-get install musl musl-dev musl-tools
-            sudo apt-get update
-            sudo apt-get install -y libwebp-dev
-
 
 jobs:
   prepare_workspace:
@@ -292,7 +295,7 @@ jobs:
       - run:
           name: Detect not merged code
           command: |
-            ls
+            ./scripts/merge_master.sh
       - install_go
       - setup
       - run:
@@ -451,8 +454,6 @@ jobs:
       - checkout
       - install_go
       - setup
-      - instal_musl
-      - install_libsodium
       - run:
           name: Update PATH and GOPATH
           command: |
@@ -488,8 +489,6 @@ jobs:
           at: ~/go
       - install_go
       - install_tensorflow
-      - instal_musl
-      - install_libsodium
       - run:
           name: Update PATH and GOPATH
           command: |
@@ -570,4 +569,4 @@ workflows:
               only: /^v.*/
           context:
             - Release
-            - weekly-beta-builds
+            - weekly-beta-builds

common/go.mod

@@ -1,9 +1,9 @@
 module github.com/pastelnetwork/gonode/common
 
-go 1.22.1
+go 1.22.0
 
 replace (
-	github.com/pastelnetwork/gonode/go-webp => ../go-webp
+	github.com/kolesa-team/go-webp => ../go-webp
 	github.com/pastelnetwork/gonode/pastel => ../pastel
 	github.com/pastelnetwork/gonode/raptorq => ../raptorq
 	golang.org/x/crypto => github.com/golang/crypto v0.13.0
@@ -18,10 +18,10 @@ require (
 	github.com/jpillora/longestcommon v0.0.0-20161227235612-adb9d91ee629
 	github.com/json-iterator/go v1.1.12
 	github.com/klauspost/compress v1.16.7
+	github.com/kolesa-team/go-webp v1.0.4
 	github.com/makiuchi-d/gozxing v0.1.1
 	github.com/mattn/go-sqlite3 v1.14.17
 	github.com/otrv4/ed448 v0.0.0-20221017120334-a33859724cfd
-	github.com/pastelnetwork/gonode/go-webp v0.0.0-20240307160103-cb14e62b9021
 	github.com/pastelnetwork/gonode/pastel v0.0.0-00010101000000-000000000000
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/errors v0.9.1

common/storage/files/file.go

@@ -15,9 +15,9 @@ import (
 
 	"github.com/pastelnetwork/gonode/common/log"
 
-	"github.com/pastelnetwork/gonode/go-webp/decoder"
-	"github.com/pastelnetwork/gonode/go-webp/encoder"
-	"github.com/pastelnetwork/gonode/go-webp/webp"
+	"github.com/kolesa-team/go-webp/decoder"
+	"github.com/kolesa-team/go-webp/encoder"
+	"github.com/kolesa-team/go-webp/webp"
 
 	"github.com/disintegration/imaging"
 	"github.com/pastelnetwork/gonode/common/errors"

dupedetection/go.mod

@@ -1,6 +1,6 @@
 module github.com/pastelnetwork/gonode/dupedetection
 
-go 1.22.1
+go 1.22.0
 
 replace (
 	github.com/pastelnetwork/gonode/common => ../common

go-webp/README.md

@@ -1,7 +1,7 @@
 # go-webp
 [![Build Status](https://travis-ci.com/kolesa-team/go-webp.svg)](https://travis-ci.com/github/kolesa-team/go-webp)
-[![GoDoc](https://godoc.org/github.com/pastelnetwork/gonode/go-webp?status.svg)](https://godoc.org/github.com/pastelnetwork/gonode/go-webp)
-[![Go Report](https://goreportcard.com/badge/github.com/pastelnetwork/gonode/go-webp)](https://goreportcard.com/report/github.com/pastelnetwork/gonode/go-webp)
+[![GoDoc](https://godoc.org/github.com/kolesa-team/go-webp?status.svg)](https://godoc.org/github.com/kolesa-team/go-webp)
+[![Go Report](https://goreportcard.com/badge/github.com/kolesa-team/go-webp)](https://goreportcard.com/report/github.com/kolesa-team/go-webp)
 
 Golang Webp library for encoding and decoding, using **C** binding for Google libwebp
 
@@ -13,13 +13,13 @@ Golang Webp library for encoding and decoding, using **C** binding for Google li
 % go test -bench "^BenchmarkDecode" ./webp                                                                                
 goos: darwin
 goarch: amd64
-pkg: github.com/pastelnetwork/gonode/go-webp/webp
+pkg: github.com/kolesa-team/go-webp/webp
 BenchmarkDecodeLossy-12                       45          25965139 ns/op
 BenchmarkDecodeXImageLossy-12                 13          90735879 ns/op
 BenchmarkDecodeLossless-12                    64          18887482 ns/op
 BenchmarkDecodeXImageLossless-12              27          42422596 ns/op
 PASS
-ok      github.com/pastelnetwork/gonode/go-webp/webp     7.877s
+ok      github.com/kolesa-team/go-webp/webp     7.877s
 ```
 
 ## Install libwebp
@@ -34,7 +34,7 @@ sudo apt-get install libwebp-dev
 ```
 
 ## Install
-`go get -u github.com/pastelnetwork/gonode/go-webp`
+`go get -u github.com/kolesa-team/go-webp`
 
 ## Examples
 
@@ -47,8 +47,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/pastelnetwork/gonode/go-webp/decoder"
-	"github.com/pastelnetwork/gonode/go-webp/webp"
+	"github.com/kolesa-team/go-webp/decoder"
+	"github.com/kolesa-team/go-webp/webp"
 )
 
 func main() {
@@ -83,8 +83,8 @@ go run example/decode/main.go
 package main
 
 import (
-	"github.com/pastelnetwork/gonode/go-webp/encoder"
-	"github.com/pastelnetwork/gonode/go-webp/webp"
+	"github.com/kolesa-team/go-webp/encoder"
+	"github.com/kolesa-team/go-webp/webp"
 	"image/jpeg"
 	"log"
 	"os"

go-webp/decoder/decoder.go

@@ -36,7 +36,7 @@ import (
 	"io/ioutil"
 	"unsafe"
 
-	"github.com/pastelnetwork/gonode/go-webp/utils"
+	"github.com/kolesa-team/go-webp/utils"
 )
 
 // Decoder stores information to decode picture

go-webp/decoder/decoder_test.go

@@ -25,7 +25,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/pastelnetwork/gonode/go-webp/utils"
+	"github.com/kolesa-team/go-webp/utils"
 )
 
 func TestNewDecoder(t *testing.T) {

go-webp/example/decode/main.go

@@ -26,8 +26,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/pastelnetwork/gonode/go-webp/decoder"
-	"github.com/pastelnetwork/gonode/go-webp/webp"
+	"github.com/kolesa-team/go-webp/decoder"
+	"github.com/kolesa-team/go-webp/webp"
 )
 
 func main() {

go-webp/example/encode/main.go

@@ -22,12 +22,11 @@
 package main
 
 import (
+	"github.com/kolesa-team/go-webp/encoder"
+	"github.com/kolesa-team/go-webp/webp"
 	"image/jpeg"
 	"log"
 	"os"
-
-	"github.com/pastelnetwork/gonode/go-webp/encoder"
-	"github.com/pastelnetwork/gonode/go-webp/webp"
 )
 
 func main() {

go-webp/go.mod

@@ -1,4 +1,4 @@
-module github.com/pastelnetwork/gonode/go-webp
+module github.com/kolesa-team/go-webp
 
 go 1.17