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.

Sign up for GitHub

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

Jump to bottom

Merge develop into master #66

Merged
merged 140 commits into from
Apr 11, 2024
Merged

Merge develop into master #66

merged 140 commits into from
Apr 11, 2024

Conversation

jdknives
Copy link
Member

No description provided.

mrpalide and others added 30 commits June 20, 2023 12:17
@mrpalide
add /dmsghttp config to config bootstrap
df1e45d
@mrpalide
fix images
7709699
@mrpalide
fix integration env configs
b2703ea
@mrpalide
update docker-compose
bfaaae2
@mrpalide
add monitors to env_test values
ddd00c2
@mrpalide
remove useless config
04ed26f
@mrpalide
update logic of reading config of vpn and public-visor monitors
daf59cb
@mrpalide
fix docker-compose config
2e08766
@0pcom
export RootCmd(s)
0cb9232
@0pcom
update go.mod & vendor
ca68f28
@mrpalide
fix build docker images for pods
10242db
@mrpalide
update Makefile
e144bd2
@0pcom
merge develop
67c413e
@0pcom
update go.mod go.sum vendor
cce4087
@0pcom
update go.mod with skywire & skywire-utilities v1.3.11
beaa4e9
@mrpalide
Merge branch 'develop' into fix/build-docker-images-on-macos
3fc4b94
@mrpalide
fix images
13a3e7a
@mrpalide
fix docker_build.sh script
21d01b1
@mrpalide
fix Makefile
99f9460
@mrpalide
fix Makefile
f6e7912
@0pcom
fix merge conflicts
5db03ef
@jdknives
Merge pull request #25 from 0pcom/export-RootCmds
16664e3 
Export RootCmds
@jdknives
Fix CI test workflow
ce97006 
Similar to Skywire main repo, we need to bump the Go version to continue
using the action for installing Go in CI.
@jdknives
Bump base image Go version for Go
b50480b
@jdknives
Merge branch 'develop' of https://github.com/skycoin/skywire-services …
fbd7706 
…into fix/build-docker-images-on-macos
@jdknives
Vendor
8d0d50d
@mrpalide
fix transport setup keys missing on dmsg-monitor and network-monitor …
3dfbd3a 
…reading config
@mrpalide
change reading config logic of vpn-monitor and public-visor-monitor
22fc18d
@mrpalide
upgrade golangci-lint to 1.52.1
84ce8cc
@mrpalide
upgrade golang:alpine to 3.19
11a37b5
0pcom and others added 29 commits February 27, 2024 08:18
@0pcom
minor cli interface refactor (#53)
e2b85b1 
* move coloredcobra initialization to command wrapper

* fix ci errors

* update dmsg to latest commit on develop
@mrpalide
fix skymessage ci issue
70aad53
@mrpalide
update skywire@develop
b8740f9
@mrpalide
Merge branch 'develop' into fix/update-dmsg-monitor-logic-based-on-ne…
1ea5461 
…w-changes-on-dmsg-discovery
@mrpalide
add skysocks-monitor to e2e
5e5d9bc
@mrpalide
fix skysock monitor issue on e2e
ccf4676
@mrpalide
Merge pull request #52 from mrpalide/fix/update-dmsg-monitor-logic-ba…
c9e98dd 
…sed-on-new-changes-on-dmsg-discovery

Improve dmsg-monitor logic
@0pcom
Improve help menus (#54)
177c854 
* add dependencies and setup instructions for core services to help menus

* update vendor deps
@mrpalide
delete syslog from whole of the repo
60e846f
@mrpalide
fix ar issue on help menu
662954c
@mrpalide
Merge pull request #57 from mrpalide/fix/remove-syslog-codes
0498a90 
Remove syslog
@mrpalide
add newTUNDevice to windows
239cff8
@mrpalide
Merge pull request #58 from mrpalide/fix/add-newTUNDevice-for-windows
caaa6f3 
Add newTUNDevice for Windows
@mrpalide
move back UT from own repo here
e87c29e
@mrpalide
udpate db config for other services like UT
ef7df7b
@mrpalide
fix tidy & vendor
e1c6bc4
@mrpalide
update skywire dockerfile and configs
ba88986
@mrpalide
update skywire dockerfile and configs 2
7ed4c26
@mrpalide
remove wrong commands
61e352d
@mrpalide
fix ut docker file
551d3da
@mrpalide
fix ENTRYPOINT of skywire
1961a1d
@mrpalide
fix docker compose command
bfc5e01
@mrpalide
fix env_test commands
a3a26ac
@mrpalide
update visor configs
e8e36b4
@mrpalide
update visor configs 2
c5b3252
@mrpalide
update skywire@develop
2fd1c10
@mrpalide
upgrade dsmg to v1.3.20
724b119
@mrpalide
Merge pull request #62 from mrpalide/fix/move-ut-back-here
58b8010 
Move back UT
@0pcom
CLI for transport setup node (#65)
50ccbbf 
* cli interface for transport setup node
* fix Makefile ; make format
@0pcom 0pcom merged commit 35e18dc into master Apr 11, 2024
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jdknives @0pcom @mrpalide