Merge pull request #378 from lightninglabs/cross-compile

Fix multiple small issues with release, prepare for 0.2.2-alpha
lightninglabs · Jun 23, 2023 · 257ad39 · 257ad39
2 parents fff9c33 + 9746bd3
commit 257ad39
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 15 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -22,6 +22,12 @@ env:
   GOPATH: /home/runner/work/go
   GO111MODULE: on
 
+  # If you change this value, please change it in the following files as well:
+  # /Dockerfile
+  # /dev.Dockerfile
+  # /make/builder.Dockerfile
+  # /taprpc/Dockerfile
+  # /tools/Dockerfile
   GO_VERSION: '1.20.5'
 
 jobs:
@@ -77,6 +83,22 @@ jobs:
       - name: compile code
         run: go install -v ./...
 
+  ########################
+  # cross compilation
+  ########################
+  cross-compile:
+    name: cross compilation
+    runs-on: ubuntu-latest
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v3
+
+      - name: setup go ${{ env.GO_VERSION }}
+        uses: ./.github/actions/setup-go
+
+      - name: build release for all architectures
+        run: make release
+
   ########################
   # Lint check.
   ########################

diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
 # If you change this value, please change it in the following files as well:
-# /.travis.yml
+# /.github/workflows/main.yaml
 # /dev.Dockerfile
 # /make/builder.Dockerfile
-# /.github/workflows/main.yml
-# /.github/workflows/release.yml
+# /taprpc/Dockerfile
+# /tools/Dockerfile
 FROM golang:1.20.5-alpine as builder
 
 # Force Go to use the cgo based DNS resolver. This is required to ensure DNS

diff --git a/dev.Dockerfile b/dev.Dockerfile
@@ -1,4 +1,9 @@
-# IMAGE FOR BUILDING
+# If you change this value, please change it in the following files as well:
+# /.github/workflows/main.yaml
+# /Dockerfile
+# /make/builder.Dockerfile
+# /taprpc/Dockerfile
+# /tools/Dockerfile
 FROM golang:1.20.5 as builder 
 
 WORKDIR /app

diff --git a/proof/aperture.go → itest/aperture_harness.go b/proof/aperture.go → itest/aperture_harness.go
@@ -1,4 +1,4 @@
-package proof
+package itest
 
 import (
 	"crypto/tls"
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/lightninglabs/aperture"
+	"github.com/lightninglabs/taproot-assets/proof"
 	"github.com/lightningnetwork/lnd/lntest/wait"
 	"github.com/stretchr/testify/require"
 )
@@ -121,5 +122,5 @@ func (h *ApertureHarness) Stop() error {
 	return h.Service.Stop()
 }
 
-// Ensure that ApertureHarness implements the CourierHarness interface.
-var _ CourierHarness = (*ApertureHarness)(nil)
+// Ensure that ApertureHarness implements the proof.CourierHarness interface.
+var _ proof.CourierHarness = (*ApertureHarness)(nil)
diff --git a/itest/tapd_harness.go b/itest/tapd_harness.go
@@ -137,7 +137,7 @@ func newTapdHarness(ht *harnessTest, cfg tapdConfig,
 
 	// Populate proof courier specific config fields.
 	switch typedProofCourier := (proofCourier).(type) {
-	case *proof.ApertureHarness:
+	case *ApertureHarness:
 		// Use passed in backoff config or default config.
 		backoffCfg := &proof.BackoffCfg{
 			BackoffResetWait: 20 * time.Second,

diff --git a/itest/test_harness.go b/itest/test_harness.go
@@ -284,7 +284,7 @@ func setupHarnesses(t *testing.T, ht *harnessTest,
 
 	case proof.ApertureCourier:
 		port := nextAvailablePort()
-		apHarness := proof.NewApertureHarness(ht.t, port)
+		apHarness := NewApertureHarness(ht.t, port)
 		proofCourier = &apHarness
 	}
 

diff --git a/make/builder.Dockerfile b/make/builder.Dockerfile
@@ -1,9 +1,9 @@
 # If you change this value, please change it in the following files as well:
-# /.travis.yml
+# /.github/workflows/main.yaml
 # /Dockerfile
 # /dev.Dockerfile
-# /.github/workflows/main.yml
-# /.github/workflows/release.yml
+# /taprpc/Dockerfile
+# /tools/Dockerfile
 FROM golang:1.20.5-buster
 
 MAINTAINER Olaoluwa Osuntokun <[email protected]>

diff --git a/taprpc/Dockerfile b/taprpc/Dockerfile
@@ -1,4 +1,10 @@
-FROM golang:1.20.4-buster
+# If you change this value, please change it in the following files as well:
+# /.github/workflows/main.yaml
+# /Dockerfile
+# /dev.Dockerfile
+# /make/builder.Dockerfile
+# /tools/Dockerfile
+FROM golang:1.20.5-buster
 
 RUN apt-get update && apt-get install -y \
   git \

diff --git a/tools/Dockerfile b/tools/Dockerfile
@@ -1,4 +1,10 @@
-FROM golang:1.20.4-buster
+# If you change this value, please change it in the following files as well:
+# /.github/workflows/main.yaml
+# /Dockerfile
+# /dev.Dockerfile
+# /make/builder.Dockerfile
+# /taprpc/Dockerfile
+FROM golang:1.20.5-buster
 
 RUN apt-get update && apt-get install -y git
 ENV GOCACHE=/tmp/build/.cache

diff --git a/version.go b/version.go
@@ -45,7 +45,7 @@ const (
 	AppMinor uint = 2
 
 	// AppPatch defines the application patch for this binary.
-	AppPatch uint = 1
+	AppPatch uint = 2
 
 	// AppPreRelease MUST only contain characters from semanticAlphabet
 	// per the semantic versioning spec.