Skip to content

Commit

Permalink
Merge pull request #1589 from skycoin/develop
Browse files Browse the repository at this point in the history 
Merge develop to master
  • Loading branch information
@jdknives
jdknives authored Jun 1, 2023
2 parents 7b89662 + bf4c3af commit de75e1d
Show file tree
Hide file tree
Showing 1,927 changed files with 368,800 additions and 196,284 deletions.
36 changes: 36 additions & 0 deletions .appveyor.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
version: "{build}"

environment:
matrix:
# For regular jobs, such as push, pr and etc.
- job_name: Deploy
appveyor_build_worker_image: ubuntu2004

for:
- # Docker Deploy (Master)
skip_tags: true
build: off
matrix:
only:
- job_name: DockerDeployMaster
branches:
only:
- master
before_deploy:
- ./ci_scripts/docker-push.sh -t master -p
deploy_script:
- echo "Master Docker Push Complete!"

- # Docker Deploy (Develop)
skip_tags: true
build: off
matrix:
only:
- job_name: DockerDeployDevelop
branches:
only:
- develop
before_deploy:
- ./ci_scripts/docker-push.sh -t develop -p
deploy_script:
- echo "Develop Docker Push Complete!"
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v3
- name: Install Requirements
run: |
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.50.1
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.1
make dep
chmod +x ./ci_scripts/create-ip-aliases.sh
./ci_scripts/create-ip-aliases.sh
Expand All @@ -19,7 +19,7 @@ jobs:
run: make check
- name: Build
run: make build

darwin:
runs-on: macos-latest
steps:
Expand All @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@v3
- name: Install Requirements
run: |
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.50.1
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.1
make dep
chmod +x ./ci_scripts/create-ip-aliases.sh
./ci_scripts/create-ip-aliases.sh
Expand All @@ -38,7 +38,7 @@ jobs:
run: make check
- name: Build
run: make build

windows:
runs-on: windows-latest
steps:
Expand All @@ -49,7 +49,7 @@ jobs:
- name: Install Requirements
run: |
choco install make
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.1
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.1
make dep
- name: Testing
run: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
.vscode/

/skywire.json
/build/
/apps/
/skywire/
/local/*
Expand Down
3 changes: 0 additions & 3 deletions .golangci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,10 @@ linters:
enable:
- revive
- goimports
- unused
- unparam
- errcheck
- gosimple
- staticcheck
- unused
- ineffassign
- typecheck
- gosec
Expand All @@ -167,7 +165,6 @@ linters:
- nakedret
- depguard
enable-all: false
disable:
disable-all: true
presets:
fast: false
Expand Down
3 changes: 0 additions & 3 deletions .goreleaser-archlinux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ archives:
name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
files:
- dmsghttp-config.json
- skycoin.asc
builds:
- skywire-visor-amd64
- skywire-cli-amd64
Expand All @@ -306,7 +305,6 @@ archives:
name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
files:
- dmsghttp-config.json
- skycoin.asc
builds:
- skywire-visor-arm64
- skywire-cli-arm64
Expand All @@ -322,7 +320,6 @@ archives:
name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
files:
- dmsghttp-config.json
- skycoin.asc
builds:
- skywire-visor-arm
- skywire-cli-arm
Expand Down
1 change: 0 additions & 1 deletion .goreleaser-darwin.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ archives:
name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
files:
- dmsghttp-config.json
- skycoin.asc
builds:
- skywire-visor
- skywire-cli
Expand Down
133 changes: 114 additions & 19 deletions .goreleaser-linux.yml
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion .goreleaser-windows.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ archives:
name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
files:
- dmsghttp-config.json
- skycoin.asc
builds:
- skywire-visor
- skywire-cli
Expand Down
66 changes: 66 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,73 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

updates may be generated with `scripts/changelog.sh <PR#lowest> <PR#highest>`

## 1.3.9

- Fix `skywire-cli config gen -r`

## 1.3.8

- Rebuild Hypervisor UI [#1583](https://github.com/skycoin/skywire/pull/1583)
- Rebuild Hypervisor UI [#1583](https://github.com/skycoin/skywire/pull/1583)
- Change Logserver to use c.JSON method ; remove variable for endpoint name '/node-info' [#1582](https://github.com/skycoin/skywire/pull/1582)
- update changelog [#1580](https://github.com/skycoin/skywire/pull/1580)
- Add Config gen flags for survey whitelist, transport and route setup pks [#1578](https://github.com/skycoin/skywire/pull/1578)
- Fix query of the conf service [#1578](https://github.com/skycoin/skywire/pull/1578)
- Revise config gen logic / structure [#1578](https://github.com/skycoin/skywire/pull/1578)
- Fix the js mime type [#1576](https://github.com/skycoin/skywire/pull/1576)
- Fix two new panic detected [#1573](https://github.com/skycoin/skywire/pull/1573)
- Health check of log collection api prerequisite for survey & transport log collection via `skywire-cli log` [#1568](https://github.com/skycoin/skywire/pull/1568)
- Fix typo on state name [#1567](https://github.com/skycoin/skywire/pull/1567)
- Log collection by secret key [#1566](https://github.com/skycoin/skywire/pull/1566)
- Optional combined compilation of `skywire-cli` `skywire-visor` & `setup-node` binaries [#1565](https://github.com/skycoin/skywire/pull/1565)
- Fix vpn start command [#1564](https://github.com/skycoin/skywire/pull/1564)
- Solve setupnode rpc issue [#1563](https://github.com/skycoin/skywire/pull/1563)
- Remove pgp encryption of the survey [#1562](https://github.com/skycoin/skywire/pull/1562)
- Change variable name [#1561](https://github.com/skycoin/skywire/pull/1561)
- add WhitelistedPKs to services struct [#1560](https://github.com/skycoin/skywire/pull/1560)
- Survey collection whitelist [#1557](https://github.com/skycoin/skywire/pull/1557)
- Dmsgpty whitelist [#1554](https://github.com/skycoin/skywire/pull/1554)
- `make config` directive & makefile optimizations [#1549](https://github.com/skycoin/skywire/pull/1549)
- Update skywire-utilities dependency [#1546](https://github.com/skycoin/skywire/pull/1546)
- fix `skywire-cli vpn list` [#1546](https://github.com/skycoin/skywire/pull/1546)
- Randomize the order of survey collection with `skywire-cli log` [#1541](https://github.com/skycoin/skywire/pull/1541)
- Fix skywire-cli config gen -a [#1539](https://github.com/skycoin/skywire/pull/1539)
- Print version of golangci-lint with `make check` [#1538](https://github.com/skycoin/skywire/pull/1538)
- Change port logic on sudph and stcpr init - set ports for sudph and stcpr [#1534](https://github.com/skycoin/skywire/pull/1534)
- Stop UI requests when not needed ; avoid unnecessary logging [#1533](https://github.com/skycoin/skywire/pull/1533)
- Remove survey checksum [#1532](https://github.com/skycoin/skywire/pull/1532)
- Update README.md [#1531](https://github.com/skycoin/skywire/pull/1531)
- Rebuild UI [#1530](https://github.com/skycoin/skywire/pull/1530)
- Logs UI [#1528](https://github.com/skycoin/skywire/pull/1528)
- Change bin_path to apps instead build/apps [#1526](https://github.com/skycoin/skywire/pull/1526)
- Fix for survey on armv7 [#1524](https://github.com/skycoin/skywire/pull/1524)
- Fix mac installer script issue [#1523](https://github.com/skycoin/skywire/pull/1523)
- Fix arm log store panic [#1522](https://github.com/skycoin/skywire/pull/1522)

## 1.3.7
- Fix deps (dependabot) [#1521](https://github.com/skycoin/skywire/pull/1521)
- improve transport logic [#1519](https://github.com/skycoin/skywire/pull/1519)
- survey issue arm7 hotfix [#1518](https://github.com/skycoin/skywire/pull/1518)
- Change build path of binaries to build folder [#1516](https://github.com/skycoin/skywire/pull/1516)
- Cli refactor [#1515](https://github.com/skycoin/skywire/pull/1515)
- update readme [#1514](https://github.com/skycoin/skywire/pull/1514)
- risc-v build [#1513](https://github.com/skycoin/skywire/pull/1513)
- Bump golang.org/x/text from 0.3.7 to 0.3.8 [#1511](https://github.com/skycoin/skywire/pull/1511)
- Bump golang.org/x/net from 0.0.0-20220722155237-a158d28d115b to 0.7.0 [#1510](https://github.com/skycoin/skywire/pull/1510)
- Bump golang.org/x/crypto from 0.0.0-20210921155107-089bfa567519 to 0.1.0 [#1509](https://github.com/skycoin/skywire/pull/1509)

## 1.3.6
- Hot fix on Launcher panic [#1508](https://github.com/skycoin/skywire/pull/1508)
- improve logging [#1507](https://github.com/skycoin/skywire/pull/1507)
- Fix appL nil [#1506](https://github.com/skycoin/skywire/pull/1506)
- fix docker login [#1503](https://github.com/skycoin/skywire/pull/1503)

## 1.3.5
- build UI for v1.3.5 [#1502](https://github.com/skycoin/skywire/pull/1502)
- remove `exec` and `profile` [#1501](https://github.com/skycoin/skywire/pull/1501)
- Update change log for patch release [#1500](https://github.com/skycoin/skywire/pull/1500)
- Remove the basic terminal from the UI [#1499](https://github.com/skycoin/skywire/pull/1499)
- Improvements for the UI code [#1498](https://github.com/skycoin/skywire/pull/1498)
- log collection size limit | improve survey logic [#1496](https://github.com/skycoin/skywire/pull/1496)
- Custom Apps [#1495](https://github.com/skycoin/skywire/pull/1495)
- improve survey logic [#1489](https://github.com/skycoin/skywire/pull/1489)
Expand Down
Loading

0 comments on commit de75e1d

Please sign in to comment.