Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.3.11 #1645

Merged
merged 39 commits into from
Jul 10, 2023
Merged

v1.3.11 #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
43ace27
Add local dir to make clean targets
Jun 2, 2023
b45aada
Vendor
jdknives Jun 2, 2023
fb8f2d4
fix and clean windows commands
mrpalide Jun 2, 2023
5111778
Merge pull request #1600 from jdknives/fix/makefile-clean-target
mrpalide Jun 2, 2023
fc2b447
fix dockerhub variable names
mrpalide Jun 2, 2023
6ee28bd
add gen_test.go ; update Makefile to run tests in ./cmd/... ; fix fmt…
0pcom Jun 8, 2023
fbac7b7
cleanup before and after test
0pcom Jun 8, 2023
9ec059d
Merge pull request #1611 from 0pcom/config-test
jdknives Jun 8, 2023
9eb1d89
change dockerhub variables from USERNAME and TOKEN to DOCKERHUB_USERN…
mrpalide Jun 9, 2023
009b501
Merge pull request #1613 from mrpalide/fix/change-dockerhub-variable-…
jdknives Jun 9, 2023
75968da
Merge pull request #1601 from mrpalide/fix/dockerhub-username-token-v…
jdknives Jun 9, 2023
3bf78cb
update dmsg@develop | use hashicorp yamux instead our outdated fork
mrpalide Jun 9, 2023
c56419d
improve log collection logic (#1615)
mrpalide Jun 11, 2023
fdc3234
add logging of survey collection image
0pcom Jun 12, 2023
6a7e968
change verification of dmsg connection to survey collection verification
0pcom Jun 12, 2023
d85e07c
Merge pull request #1618 from skycoin/mainnet-rules
jdknives Jun 14, 2023
b2fd0cd
limit skywire-cli log to online visors
0pcom Jun 14, 2023
a1f98ad
Merge pull request #1623 from 0pcom/log-collect-online
mrpalide Jun 15, 2023
7d2a647
backed normal timeout of transport.manager shutting down module timeo…
mrpalide Jun 15, 2023
ceb1b90
Merge pull request #1624 from mrpalide/fix/reduce-shutting-down-timeout
jdknives Jun 15, 2023
7db3bd7
collect transport logging for today by default with skywire-cli log
0pcom Jun 15, 2023
c639352
Merge remote-tracking branch 'origin/develop' into fix/update-dmsg-us…
jdknives Jun 19, 2023
a33093b
Merge pull request #1614 from mrpalide/fix/update-dmsg-use-hashicorp-…
jdknives Jun 19, 2023
7d6e788
Vendor dmsg@master and replace two yamux deps
jdknives Jun 19, 2023
83c670a
Fix linter issue
jdknives Jun 19, 2023
b55ecc0
use golang-ipc v1.1.0 instead latest version
mrpalide Jun 21, 2023
49b7869
fix read and write issue on tunDevice wrapper
mrpalide Jun 21, 2023
b482716
set flags as mutually exclusive with cobra
0pcom Jun 22, 2023
a69a81c
update vendor
0pcom Jun 22, 2023
aaac4e4
merge develop
0pcom Jun 22, 2023
6b25f5a
Merge pull request #1629 from 0pcom/exclusive-flags
jdknives Jun 24, 2023
cbaf4a0
Update dmsghttp config
jdknives Jun 25, 2023
d135ef1
Merge pull request #1632 from jdknives/fix/update-dmsghttp-conf
jdknives Jun 26, 2023
b35789f
Merge pull request #1625 from 0pcom/log-collect-today
jdknives Jun 26, 2023
c36d0b3
`source` a .conf file with `skywire-cli config gen` (#1558)
0pcom Jul 7, 2023
b03f7a5
source a .conf file with skywire-cli config gen (#1644)
0pcom Jul 9, 2023
5edd768
Merge branch 'develop' of https://github.com/skycoin/skywire
jdknives Jul 10, 2023
13c6889
Merge branch 'master' of https://github.com/jdknives/skywire
jdknives Jul 10, 2023
059faff
Merge pull request #1626 from jdknives/master
jdknives Jul 10, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.USERNAME }}
password: ${{ secrets.TOKEN }}
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- uses: actions/checkout@v3
- name: deploy to docker
run: |
Expand Down
30 changes: 9 additions & 21 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,12 @@ commit:

check: lint test ## Run linters and tests

check-windows: lint-windows test-windows ## Run linters and tests on appveyor windows image
check-windows: lint-windows test-windows ## Run linters and tests on windows image

build: host-apps bin ## Install dependencies, build apps and binaries. `go build` with ${OPTS}

build-windows: host-apps-windows bin-windows ## Install dependencies, build apps and binaries. `go build` with ${OPTS}

build-windows-appveyor: host-apps-windows-appveyor bin-windows-appveyor ## Install dependencies, build apps and binaries. `go build` with ${OPTS} for AppVeyor image

build-static: host-apps-static bin-static ## Build apps and binaries. `go build` with ${OPTS}

build-static-wos: host-apps-static bin-static-wos ## Build apps and binaries. `go build` with ${OPTS}
Expand All @@ -127,10 +125,11 @@ generate: ## Generate mocks and config README's
go generate ./...

clean: ## Clean project: remove created binaries and apps
-rm -rf ./build
-rm -rf ./build ./local

clean-windows: ## Clean project: remove created binaries and apps
powershell -Command Remove-Item -Path ./build -Force -Recurse
powershell -Command "If (Test-Path ./local) { Remove-Item -Path ./local -Force -Recurse }"
powershell -Command "If (Test-Path ./build) { Remove-Item -Path ./build -Force -Recurse }"

install: ## Install `skywire-visor`, `skywire-cli`, `setup-node`
${OPTS} go install ${BUILD_OPTS} ./cmd/skywire-visor ./cmd/skywire-cli ./cmd/setup-node
Expand All @@ -149,18 +148,14 @@ lint-windows: ## Run linters. Use make install-linters-windows first
powershell 'golangci-lint --version'
powershell 'golangci-lint run -c .golangci.yml ./...'

lint-appveyor-windows: ## Run linters for appveyor only on windows
C:\Users\appveyor\go\bin\golangci-lint --version
C:\Users\appveyor\go\bin\golangci-lint run -c .golangci.yml ./...

test: ## Run tests
-go clean -testcache &>/dev/null
${OPTS} go test ${TEST_OPTS} ./internal/... ./pkg/...
${OPTS} go test ${TEST_OPTS} ./internal/... ./pkg/... ./cmd/...
${OPTS} go test ${TEST_OPTS}

test-windows: ## Run tests on windows
@go clean -testcache
${OPTS} go test ${TEST_OPTS} ./internal/... ./pkg/...
${OPTS} go test ${TEST_OPTS} ./internal/... ./pkg/... ./cmd/...

install-linters: ## Install linters
- VERSION=latest ./ci_scripts/install-golangci-lint.sh
Expand Down Expand Up @@ -200,12 +195,8 @@ example-apps: ## Build example apps
${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH)apps/ ./example/...

host-apps-windows: ## build apps on windows
powershell -Command new-item .\apps -itemtype directory -force
powershell 'Get-ChildItem .\cmd\apps | % { ${OPTS} go build ${BUILD_OPTS} -o ./apps $$_.FullName }'

host-apps-windows-appveyor: ## build apps on windows. `go build` with ${OPTS} for AppVeyor image
powershell -Command new-item .\apps -itemtype directory -force
powershell 'Get-ChildItem .\cmd\apps | % { ${OPTS} go build -o ./apps $$_.FullName }'
powershell -Command new-item $(BUILD_PATH)apps -itemtype directory -force
powershell 'Get-ChildItem .\cmd\apps | % { ${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH)apps $$_.FullName }'

# Static Apps
host-apps-static: ## Build app
Expand Down Expand Up @@ -240,10 +231,7 @@ unfix-systray-vendor:
fi

bin-windows: ## Build `skywire-visor`, `skywire-cli`
powershell 'Get-ChildItem .\cmd | % { ${OPTS} go build ${BUILD_OPTS} -o ./ $$_.FullName }'

bin-windows-appveyor: ## Build `skywire-visor`, `skywire-cli`
powershell 'Get-ChildItem .\cmd | % { ${OPTS} go build -o ./ $$_.FullName }'
powershell 'Get-ChildItem .\cmd | % { ${OPTS} go build ${BUILD_OPTS} -o $(BUILD_PATH) $$_.FullName }'

# Static Bin
bin-static: ## Build `skywire-visor`, `skywire-cli`
Expand Down
2 changes: 1 addition & 1 deletion cmd/skywire-cli/commands/completion/completion.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var RootCmd = &cobra.Command{
Short: "Generate completion script",
DisableFlagsInUseLine: true,
ValidArgs: []string{"bash", "zsh", "fish", "powershell"},
Args: cobra.ExactValidArgs(1),
Args: cobra.MatchAll(cobra.ExactArgs(1)),
Run: func(cmd *cobra.Command, args []string) {
switch args[0] {
case "bash":
Expand Down
Loading