Skip to content

Commit

Permalink
chore: bump status-go to release/2.30 and other fixes for CI (#17)
Browse files Browse the repository at this point in the history
This commit : 
-  updates status-go to the version 2.30 release uses this tag -> https://github.com/status-im/status-go/releases/tag/v0.182.39
- nukes windows and Darwin build step from github actions.
- nukes the steam bridge because we don't bridge steam and it was giving me a hard time with tests stage.
- updates `.golanglint-ci` rules to skip `bridge/status/status.go`
- enables `CGO` because `status-go` now needs it.
- makes other necessary reference changes in `go.mod` for build to pass.
  • Loading branch information
siddarthkay authored Sep 10, 2024
1 parent 357a97a commit bd655dd
Show file tree
Hide file tree
Showing 1,596 changed files with 111,685 additions and 184,182 deletions.
28 changes: 7 additions & 21 deletions .github/workflows/development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
uses: golangci/golangci-lint-action@v3
with:
version: latest
args: "-v --new-from-rev HEAD~5"
args: "-v --new-from-rev HEAD~5 --timeout=15m"
test-build-upload:
strategy:
matrix:
go-version: [1.20.x]
go-version: [1.21.x]
platform: [ubuntu-latest]
runs-on: ${{ matrix.platform }}
steps:
Expand All @@ -30,29 +30,15 @@ jobs:
with:
fetch-depth: 0
- name: Test
run: go test ./... -mod=vendor
run: go test $(go list ./...) -mod=vendor
- name: Build
run: |
mkdir -p output/{win,lin,arm,mac}
mkdir -p output/{lin}
VERSION=$(git describe --tags)
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s -X github.com/42wim/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o output/lin/matterbridge-$VERSION-linux-amd64
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "-s -X github.com/42wim/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o output/win/matterbridge-$VERSION-windows-amd64.exe
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags "-s -X github.com/42wim/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o output/mac/matterbridge-$VERSION-darwin-amd64
CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags "-s -X github.com/42wim/matterbridge/version.GitHash=$(git log --pretty=format:'%h' -n 1)" -o output/lin/matterbridge-$VERSION-linux-amd64
- name: Upload linux 64-bit
if: startsWith(matrix.go-version,'1.20')
if: startsWith(matrix.go-version,'1.21')
uses: actions/upload-artifact@v3
with:
name: matterbridge-linux-64bit
path: output/lin
- name: Upload windows 64-bit
if: startsWith(matrix.go-version,'1.20')
uses: actions/upload-artifact@v3
with:
name: matterbridge-windows-64bit
path: output/win
- name: Upload darwin 64-bit
if: startsWith(matrix.go-version,'1.20')
uses: actions/upload-artifact@v3
with:
name: matterbridge-darwin-64bit
path: output/mac
path: output/lin
18 changes: 2 additions & 16 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,6 @@ run:
# list of build tags, all linters use it. Default is empty list.
build-tags:

# which dirs to skip: they won't be analyzed;
# can use regexp here: generated.*, regexp is applied on full path;
# default value is empty list, but next dirs are always skipped independently
# from this option's value:
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
skip-dirs: gateway/bridgemap$

# which files to skip: they will be analyzed, but issues from them
# won't be reported. Default value is empty list, but there is
# no need to include all autogenerated files, we confidently recognize
# autogenerated files. If it's not please let us know.
skip-files:


# output configuration options
output:
# colored-line-number|line-number|json|tab|checkstyle, default is "colored-line-number"
Expand Down Expand Up @@ -164,7 +150,6 @@ linters-settings:
- wrapperFunc
- yodaStyleExpr


# linters that we should / shouldn't run
linters:
enable-all: true
Expand Down Expand Up @@ -218,7 +203,8 @@ issues:
# But independently from this option we use default exclude patterns,
# it can be disabled by `exclude-use-default: false`. To list all
# excluded by default patterns execute `golangci-lint run --help`
exclude:
exclude-dirs:
- bridge/status

# Independently from option `exclude` we use default exclude patterns,
# it can be disabled by this option. To list all
Expand Down
5 changes: 1 addition & 4 deletions bridge/status/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@ func (b *Bstatus) Connect() error {
gethbridge.NewNodeBridge(b.statusNode.GethNode(), nil, b.statusNode.WakuV2Service()),
installationID,
peerStore,
"v0.182.39-0",
options...,
)
if err != nil {
Expand All @@ -414,10 +415,6 @@ func (b *Bstatus) Connect() error {
messenger.SetP2PServer(b.statusNode.GethNode().Server())
messenger.EnableBackedupMessagesProcessing()

if err := messenger.Init(); err != nil {
return errors.Wrap(err, "Failed to init Messenger")
}

if _, err := messenger.Start(); err != nil {
return errors.Wrap(err, "Failed to start Messenger")
}
Expand Down
126 changes: 0 additions & 126 deletions bridge/steam/handlers.go

This file was deleted.

95 changes: 0 additions & 95 deletions bridge/steam/steam.go

This file was deleted.

11 changes: 0 additions & 11 deletions gateway/bridgemap/bsteam.go

This file was deleted.

Loading

0 comments on commit bd655dd

Please sign in to comment.