Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .github/workflows/development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ permissions:
pull-requests: read
jobs:
lint:
if: ${{ github.repository == 'matterbridge-org/matterbridge' }}
name: golangci-lint
runs-on: ubuntu-latest
steps:
Expand All @@ -33,6 +34,38 @@ jobs:
with:
version: v2.1
args: --build-tags=goolm --config=.golangci-incremental.yaml
lint_personal_fork:
if: ${{ github.repository != 'matterbridge-org/matterbridge' }}
name: golangci-lint (personal fork branch)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- run: "git remote add upstream https://github.com/matterbridge-org/matterbridge"
# - run: "git fetch upstream master"
# - run: "git branch __ci_upstream_master FETCH_HEAD"
- run: "git fetch upstream master"
# We only compare with the most recent common ancestor. Otherwise, code that was removed
# upstream but does not conflict (and therefore will not appear in Github PR UI)
# will trigger new linter errors downstream (false positive).
# - run: echo "COMMON_ANCESTOR=$(git merge-base __ci_upstream_master ${{ github.ref }})" >> $GITHUB_ENV
# - run: echo "COMMON_ANCESTOR=$(git merge-base __ci_upstream_master ${{ github.ref }})"
- uses: actions/setup-go@v6
with:
go-version: 1.24.x
- name: golangci-lint
uses: golangci/golangci-lint-action@v8
with:
# Maybe only-new-issues works with a simple unshallow?
# only-new-issues: true
version: v2.1
skip-cache: true
args: --build-tags=goolm --new-from-rev=upstream/master
# Compare to upstream's master branch.
# It looks like Github Actions partial clones don't really like comparing
# with previous commit overwritten by a force push, which in any case does
# not really make sense when working on a feature branch.
# args: >-
# --build-tags=goolm --new-from-rev=${{ env.COMMON_ANCESTOR }}
test:
strategy:
matrix:
Expand All @@ -51,6 +84,8 @@ jobs:
- name: go test -tags goolm ./... (go version ${{ matrix.go-version }})
run: go test -tags goolm ./...
build-upload:
# Dont build artifacts for downstream branches not tracked by a PR
if: ${{ github.event_name == 'pull_request' || github.repository == 'matterbridge-org/matterbridge' }}
# Uploading artifacts only if lint/test succeeded
needs: [ "lint", "test" ]
strategy:
Expand Down
5 changes: 3 additions & 2 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@

## Upstream

- xmpp: go-xmpp updated to xmppo/go-xmpp v0.3.1
- whatsappmulti: whatsmeow updated to v20251116104239 ([#13](https://github.com/matterbridge-org/matterbridge/pull/13), thanks @alvindimas05)
- discord: discordgo updated to v0.29.0
- xmpp: go-xmpp updated to xmppo/go-xmpp v0.3.2
- whatsappmulti: whatsmeow updated to commit 7b33f62 (2026-02-11)

## Minor changes

Expand Down
60 changes: 26 additions & 34 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ module github.com/matterbridge-org/matterbridge
require (
github.com/Benau/tgsconverter v0.0.0-20210809170556-99f4a4f6337f
github.com/SevereCloud/vksdk/v2 v2.17.0
github.com/bwmarrin/discordgo v0.28.1
github.com/bwmarrin/discordgo v0.29.0
github.com/d5/tengo/v2 v2.17.0
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
github.com/fsnotify/fsnotify v1.7.0
github.com/fsnotify/fsnotify v1.9.0
github.com/gomarkdown/markdown v0.0.0-20240419095408-642f0ee99ae2
github.com/google/gops v0.3.27
github.com/google/gops v0.3.29
github.com/gorilla/schema v1.4.1
github.com/hashicorp/golang-lru v1.0.2
github.com/jpillora/backoff v1.0.0
github.com/kyokomi/emoji/v2 v2.2.13
github.com/labstack/echo/v4 v4.12.0
github.com/labstack/echo/v4 v4.15.1
github.com/lrstanley/girc v1.1.1
github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20211016222428-79310a412696
github.com/matterbridge/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75
Expand All @@ -26,30 +26,30 @@ require (
github.com/mdp/qrterminal v1.0.1
github.com/mitchellh/mapstructure v1.5.0
github.com/nelsonken/gomf v0.0.0-20190423072027-c65cc0469e94
github.com/olahol/melody v1.2.1
github.com/olahol/melody v1.4.0
github.com/paulrosania/go-charset v0.0.0-20190326053356-55c9d7a5834c
github.com/rs/xid v1.6.0
github.com/russross/blackfriday v1.6.0
github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d
github.com/shazow/ssh-chat v1.10.1
github.com/sirupsen/logrus v1.9.3
github.com/sirupsen/logrus v1.9.4
github.com/slack-go/slack v0.17.3
github.com/spf13/viper v1.19.0
github.com/spf13/viper v1.21.0
github.com/stretchr/testify v1.11.1
github.com/vincent-petithory/dataurl v1.0.0
github.com/writeas/go-strip-markdown v2.0.1+incompatible
github.com/xmppo/go-xmpp v0.3.2
github.com/yaegashi/msgraph.go v0.1.4
github.com/zfjagann/golang-ring v0.0.0-20220330170733-19bcea1b6289
go.mau.fi/whatsmeow v0.0.0-20260123132415-83db04703aee
golang.org/x/image v0.19.0
golang.org/x/oauth2 v0.22.0
golang.org/x/text v0.33.0
go.mau.fi/whatsmeow v0.0.0-20260211193157-7b33f6289f98
golang.org/x/image v0.36.0
golang.org/x/oauth2 v0.35.0
golang.org/x/text v0.34.0
gomod.garykim.dev/nc-talk v0.3.0
google.golang.org/protobuf v1.36.11
layeh.com/gumble v0.0.0-20221205141517-d1df60a3cc14
maunium.net/go/mautrix v0.26.1
modernc.org/sqlite v1.32.0
maunium.net/go/mautrix v0.26.2
modernc.org/sqlite v1.46.1
)

require (
Expand All @@ -67,7 +67,7 @@ require (
github.com/fatih/color v1.17.0 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect
github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gopackage/ddp v0.0.3 // indirect
Expand All @@ -76,13 +76,10 @@ require (
github.com/hashicorp/go-hclog v1.6.3 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-plugin v1.6.1 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/kettek/apng v0.0.0-20191108220231-414630eed80f // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/labstack/gommon v0.4.2 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 // indirect
github.com/mattermost/ldap v0.0.0-20231116144001-0f480c025956 // indirect
github.com/mattermost/logr/v2 v2.0.21 // indirect
Expand All @@ -93,12 +90,12 @@ require (
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/monaco-io/request v1.0.5 // indirect
github.com/ncruces/go-strftime v0.1.9 // indirect
github.com/ncruces/go-strftime v1.0.0 // indirect
github.com/nxadm/tail v1.4.11 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/pborman/uuid v1.2.1 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/petermattis/goid v0.0.0-20260113132338-7c7de50cc741 // indirect
github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect
github.com/pkg/errors v0.9.1 // indirect
Expand All @@ -108,14 +105,13 @@ require (
github.com/rickb777/plural v1.2.0 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rs/zerolog v1.34.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sagikazarmark/locafero v0.11.0 // indirect
github.com/shazow/rateio v0.0.0-20200113175441-4461efc8bdc4 // indirect
github.com/sizeofint/webpanimation v0.0.0-20210809145948-1d2b32119882 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
github.com/spf13/afero v1.15.0 // indirect
github.com/spf13/cast v1.10.0 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tidwall/gjson v1.18.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
Expand All @@ -132,25 +128,21 @@ require (
github.com/wiggin77/srslog v1.0.1 // indirect
go.mau.fi/libsignal v0.2.1 // indirect
go.mau.fi/util v0.9.5 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.47.0 // indirect
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
golang.org/x/net v0.49.0 // indirect
golang.org/x/sys v0.40.0 // indirect
golang.org/x/term v0.39.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/time v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect
google.golang.org/grpc v1.65.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
modernc.org/libc v1.55.3 // indirect
modernc.org/mathutil v1.6.0 // indirect
modernc.org/memory v1.8.0 // indirect
modernc.org/strutil v1.2.0 // indirect
modernc.org/token v1.1.0 // indirect
modernc.org/libc v1.67.6 // indirect
modernc.org/mathutil v1.7.1 // indirect
modernc.org/memory v1.11.0 // indirect
rsc.io/qr v0.2.0 // indirect
)

Expand Down
Loading
Loading