From 31537adfc7698e61e77fdda3e05f58807805b864 Mon Sep 17 00:00:00 2001
From: danbugs <danilochiarlone@gmail.com>
Date: Sun, 24 Dec 2023 16:41:53 -0800
Subject: [PATCH 1/2] Fixing docker-deploy.yml

Signed-off-by: danbugs <danilochiarlone@gmail.com>
---
 .github/workflows/{build.yml => ci-cd.yml} | 20 +++++++++++++-
 .github/workflows/docker-deploy.yml        | 31 ----------------------
 2 files changed, 19 insertions(+), 32 deletions(-)
 rename .github/workflows/{build.yml => ci-cd.yml} (78%)
 delete mode 100644 .github/workflows/docker-deploy.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/ci-cd.yml
similarity index 78%
rename from .github/workflows/build.yml
rename to .github/workflows/ci-cd.yml
index a4835b3..6ecf85b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/ci-cd.yml
@@ -1,4 +1,4 @@
-name: CI
+name: CI/CD
 
 on:
   push:
@@ -88,3 +88,21 @@ jobs:
       with:
         name: pidgtm-${{ matrix.target }}
         path: target/${{ matrix.target }}/release/pidgtm
+
+  docker-deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Download artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: pidgtm-x86_64-unknown-linux-gnu
+
+      - name: Build Docker image
+        run: |
+          docker build -t pidgtm-user-updater:latest -f Dockerfile-UserUpdater .
+          echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+          docker push pidgtm-user-updater:latest
diff --git a/.github/workflows/docker-deploy.yml b/.github/workflows/docker-deploy.yml
deleted file mode 100644
index ae84c35..0000000
--- a/.github/workflows/docker-deploy.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Docker Deployment
-
-on:
-  workflow_run:
-    workflows: ["CI"]
-    types:
-      - completed
-  workflow_dispatch:
-
-jobs:
-  docker-deploy:
-    runs-on: ubuntu-latest
-    if: >
-      (github.event.workflow_run && 
-      github.event.workflow_run.conclusion == 'success' &&
-      github.event.workflow_run.head_branch == 'main' &&
-      github.event.workflow_run.event == 'push') || 
-      github.event_name == 'workflow_dispatch'
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Download artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: pidgtm-x86_64-unknown-linux-gnu
-
-      - name: Build Docker image
-        run: |
-          docker build -t pidgtm-user-updater:latest -f Dockerfile-UserUpdater .
-          echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-          docker push pidgtm-user-updater:latest

From 0c1065d887fd8eb82ed637b11364d76a0b488dcf Mon Sep 17 00:00:00 2001
From: danbugs <danilochiarlone@gmail.com>
Date: Sun, 24 Dec 2023 16:43:52 -0800
Subject: [PATCH 2/2] Small Rust change to trigger ci-cd

Signed-off-by: danbugs <danilochiarlone@gmail.com>
---
 lib/src/player.rs     | 2 +-
 lib/src/tournament.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/player.rs b/lib/src/player.rs
index 140b299..aacfb1f 100644
--- a/lib/src/player.rs
+++ b/lib/src/player.rs
@@ -264,7 +264,7 @@ where
                         &s.event.tournament.as_ref().unwrap().name,
                         s.event.tournament.as_ref().unwrap().endAt,
                         player.id,
-                        get_placement(player.id, &s),
+                        get_placement(&s, player.id),
                         s.event.numEntrants.unwrap(),
                         get_seed(requester_entrant_id, &s),
                         format!("https://www.start.gg/{}", s.event.slug.as_ref().unwrap()).as_str(),
diff --git a/lib/src/tournament.rs b/lib/src/tournament.rs
index fdcb1d2..4479cdd 100644
--- a/lib/src/tournament.rs
+++ b/lib/src/tournament.rs
@@ -36,7 +36,7 @@ fn get_standing_of_player_from_sggset(s: &SGGSet, player_id: i32) -> Standing {
     }
 }
 
-pub fn get_placement(player_id: i32, s: &SGGSet) -> i32 {
+pub fn get_placement(s: &SGGSet, player_id: i32) -> i32 {
     let standing = get_standing_of_player_from_sggset(s, player_id);
     standing.placement.unwrap()
 }