From a8ef24704e7bf6492a0ab22eaa0842a05fbb47f6 Mon Sep 17 00:00:00 2001 From: Thijs Stobbelaar Date: Tue, 26 Sep 2023 14:51:09 +0200 Subject: [PATCH] auto deploy dev --- .github/workflows/main.yml | 21 +++++++++++++++++++++ .gitignore | 3 ++- update/matchparser.ps1 | 3 --- update/update_clan_members.ps1 | 6 +++--- user_stats.php | 4 ++++ 5 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..872d007 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,21 @@ +on: + push: + branches: + - dev + +name: Publish Website +jobs: + web-deploy: + name: Deploy on commit DEV + runs-on: ubuntu-latest + steps: + - name: Get Latest Code + uses: actions/checkout@v3 + + - name: Sync Files + uses: SamKirkland/web-deploy@v1 + with: + target-server: lanta.eu + remote-user: stats + private-ssh-key: ${{ secrets.SSH_KEY }} + destination-path: /var/www/lantaeu/DTCH_DEV/ diff --git a/.gitignore b/.gitignore index 07f5654..8fe5338 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ config/config.php -data/telemetry_cache/* \ No newline at end of file +data/telemetry_cache/* +temp/* \ No newline at end of file diff --git a/update/matchparser.ps1 b/update/matchparser.ps1 index fa8a055..608d635 100644 --- a/update/matchparser.ps1 +++ b/update/matchparser.ps1 @@ -72,10 +72,7 @@ foreach ($player in $all_player_matches.playername) { matches = ($all_player_matches | where-object { $_.playername -eq $player }).player_matches.count KD_H = $humankills / $deaths KD_ALL = $kills / $deaths - - } - } $currentDateTime = Get-Date diff --git a/update/update_clan_members.ps1 b/update/update_clan_members.ps1 index 990be2a..9d9a8cd 100644 --- a/update/update_clan_members.ps1 +++ b/update/update_clan_members.ps1 @@ -59,9 +59,9 @@ $playermodes = @( "solo", "duo", "squad" - #"solo-fpp", - #"duo-fpp", - #"squad-fpp" + "solo-fpp", + "duo-fpp", + "squad-fpp" ) # Initialize the master hashtable $lifetimestats = @{} diff --git a/user_stats.php b/user_stats.php index ec6e2f6..a647844 100644 --- a/user_stats.php +++ b/user_stats.php @@ -32,6 +32,10 @@ error_reporting(E_ALL); + + + +
"; // Buttons for each player