Merge branch 'johanhelsing:main' into connection-severing

johanhelsing · Jan 1, 2024 · a618737 · a618737
2 parents bf3a9bf + b5013e1
commit a618737
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 8 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -12,3 +12,7 @@ updates:
     directory: /
     schedule:
       interval: weekly
+    groups:
+      patch-updates:
+        update-types:
+          - "patch"
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
@@ -1,5 +1,7 @@
 on:
   push:
+    branches:
+      - main
   pull_request:
 
 name: Code

diff --git a/.github/workflows/lint-toml.yml b/.github/workflows/lint-toml.yml
@@ -1,5 +1,7 @@
 on:
   push:
+    branches:
+      - main
   pull_request:
 
 name: Lint TOML

diff --git a/.github/workflows/markdown-lint.yml b/.github/workflows/markdown-lint.yml
@@ -1,5 +1,7 @@
 on:
   push:
+    branches:
+      - main
   pull_request:
 
 name: Markdown Lint

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/matchbox_server/Dockerfile b/matchbox_server/Dockerfile
@@ -3,7 +3,7 @@
 # to build, run `docker build -f matchbox_server/Dockerfile` from root of the
 # repository
 
-FROM rust:1.73-slim-bullseye as builder
+FROM rust:1.74-slim-bullseye as builder
 
 WORKDIR /usr/src/matchbox_server/
 

diff --git a/matchbox_socket/src/ggrs_socket.rs b/matchbox_socket/src/ggrs_socket.rs
@@ -4,8 +4,8 @@ use ggrs::{Message, PlayerType};
 use matchbox_protocol::PeerId;
 
 use crate::{
-    ChannelConfig, MessageLoopFuture, MultipleChannels, NoChannels, Packet, SingleChannel,
-    WebRtcChannel, WebRtcSocket, WebRtcSocketBuilder,
+    ChannelConfig, ChannelPlurality, MessageLoopFuture, MultipleChannels, NoChannels, Packet,
+    SingleChannel, WebRtcChannel, WebRtcSocket, WebRtcSocketBuilder,
 };
 
 impl ChannelConfig {
@@ -64,7 +64,7 @@ impl WebRtcSocket {
     }
 }
 
-impl WebRtcSocket {
+impl<C: ChannelPlurality> WebRtcSocket<C> {
     /// Returns a Vec of connected peers as [`ggrs::PlayerType`]
     pub fn players(&mut self) -> Vec<PlayerType<PeerId>> {
         let Some(our_id) = self.id() else {