Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/skycoin/skybian into dev…
Browse files Browse the repository at this point in the history
…elop
  • Loading branch information
jdknives committed Feb 17, 2022
2 parents 38e9e1f + aac916f commit 615a595
Show file tree
Hide file tree
Showing 472 changed files with 33,231 additions and 5,172 deletions.
4 changes: 2 additions & 2 deletions build.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#
# version must always start with "v" like: v0.1.45-rc

VERSION=v0.5.0-rc
VERSION=v0.5.0

# This must match the tags in the github repository

Expand All @@ -25,7 +25,7 @@ RASPBIAN_ARM_DOWNLOAD_URL="https://downloads.raspberrypi.org/raspios_lite_armhf/
RASPBIAN_ARM64_DOWNLOAD_URL="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2021-05-28/2021-05-07-raspios-buster-arm64-lite.zip"

# Skywire release download for OS running on destination skyminer
SKYWIRE_VERSION=v0.6.0-rc1
SKYWIRE_VERSION=v0.6.0

SKYWIRE_ARM64_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-arm64.tar.gz"
SKYWIRE_ARM_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-arm.tar.gz"
Expand Down
9 changes: 4 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@ go 1.16

require (
fyne.io/fyne/v2 v2.1.0
github.com/fyne-io/fyne-cross v1.1.3 // indirect
github.com/google/go-github v17.0.0+incompatible
github.com/mholt/archiver v3.1.1+incompatible
github.com/rakyll/statik v0.1.7
github.com/sirupsen/logrus v1.8.1
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
github.com/skycoin/dmsg v0.0.0-20211125122021-388f2fc645c9
github.com/skycoin/dmsg v0.0.0-20220125112430-1dfce6ea8ef3
github.com/skycoin/skycoin v0.27.1
github.com/skycoin/skywire v0.5.2-0.20211125164518-be38adb86ad3
github.com/stretchr/testify v1.6.1
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
github.com/skycoin/skywire v0.6.0-rc2.0.20220211172508-37eabd36ef15
github.com/stretchr/testify v1.7.0
golang.org/x/net v0.0.0-20211020060615-d418f374d309
)

// Uncomment it for tests with alternative branches and run `make dep`
Expand Down
571 changes: 473 additions & 98 deletions go.sum

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pkg/imager/fyne_pages.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,10 @@ func (fg *FyneUI) Page2() fyne.CanvasObject {
genHvImg.SetChecked(fg.hvImg)

useDMSGHTTP := widget.NewCheck("Use dmsgHTTP.", func(b bool) {
if b {
fg.dmsghttp = b
}
fg.dmsghttp = b
fg.log.Debugf("Set: fg.useDMSGHTTP = %v", b)
})
genHvImg.SetChecked(fg.dmsghttp)

hvPKs := container.NewVBox()
hvPKs.Hide()
Expand Down
29 changes: 29 additions & 0 deletions vendor/github.com/ActiveState/termtest/conpty/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions vendor/github.com/ActiveState/termtest/conpty/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

250 changes: 250 additions & 0 deletions vendor/github.com/ActiveState/termtest/conpty/conpty_windows.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions vendor/github.com/ActiveState/termtest/conpty/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 615a595

Please sign in to comment.