From 79be77f4cb0b081ab411fa04fbed9c0c726e0899 Mon Sep 17 00:00:00 2001 From: diamante0018 Date: Thu, 22 May 2025 10:39:39 +0200 Subject: [PATCH] feat: test CI --- .gitea/workflows/ci.yml | 70 +++++++++++++++++++ .gitea/workflows/lint.yml | 22 ------ LICENSE | 2 +- {dw => data/dw}/entitlement_config_tu14.info | 0 {dw => data/dw}/mm.cfg | 0 {dw => data/dw}/newsfeed.txt | 0 {dw => data/dw}/playlists_tu14.aggr | 0 {dw => data/dw}/social_tu14.cfg | 0 {maps => data/maps}/mp/alien/_drill.gsc | 0 {maps => data/maps}/mp/gametypes/_damage.gsc | 0 .../maps}/mp/gametypes/_gamelogic.gsc | 0 {maps => data/maps}/mp/gametypes/_menus.gsc | 0 .../maps}/mp/gametypes/_playerlogic.gsc | 0 {maps => data/maps}/mp/gametypes/aliens.gsc | 0 {maps => data/maps}/mp/mp_alien_beacon.gsc | 2 +- data/open_source_software_disclosure.txt | 16 +++++ {scripts => data/scripts}/mp/_patches.gsc | 0 .../scripts}/mp/_team_balance.gsc | 0 {sound => data/sound}/patch-3-music.flac | 0 .../ui_scripts}/end_game/__init__.lua | 0 .../ui_scripts}/infect/__init__.lua | 0 .../ui_scripts}/main_menu/__init__.lua | 0 .../ui_scripts}/menu_mods/__init__.lua | 0 .../ui_scripts}/menu_xboxlive/__init__.lua | 0 .../mp_live_public_lobby/__init__.lua | 0 .../ui_scripts}/server_filter/__init__.lua | 0 .../ui_scripts}/server_list/__init__.lua | 0 .../ui_scripts}/stats/__init__.lua | 0 .../ui_scripts}/string_override/__init__.lua | 0 .../ui_scripts}/team_select/__init__.lua | 0 30 files changed, 88 insertions(+), 24 deletions(-) create mode 100644 .gitea/workflows/ci.yml delete mode 100644 .gitea/workflows/lint.yml rename {dw => data/dw}/entitlement_config_tu14.info (100%) rename {dw => data/dw}/mm.cfg (100%) rename {dw => data/dw}/newsfeed.txt (100%) rename {dw => data/dw}/playlists_tu14.aggr (100%) rename {dw => data/dw}/social_tu14.cfg (100%) rename {maps => data/maps}/mp/alien/_drill.gsc (100%) rename {maps => data/maps}/mp/gametypes/_damage.gsc (100%) rename {maps => data/maps}/mp/gametypes/_gamelogic.gsc (100%) rename {maps => data/maps}/mp/gametypes/_menus.gsc (100%) rename {maps => data/maps}/mp/gametypes/_playerlogic.gsc (100%) rename {maps => data/maps}/mp/gametypes/aliens.gsc (100%) rename {maps => data/maps}/mp/mp_alien_beacon.gsc (99%) create mode 100644 data/open_source_software_disclosure.txt rename {scripts => data/scripts}/mp/_patches.gsc (100%) rename {scripts => data/scripts}/mp/_team_balance.gsc (100%) rename {sound => data/sound}/patch-3-music.flac (100%) rename {ui_scripts => data/ui_scripts}/end_game/__init__.lua (100%) rename {ui_scripts => data/ui_scripts}/infect/__init__.lua (100%) rename {ui_scripts => data/ui_scripts}/main_menu/__init__.lua (100%) rename {ui_scripts => data/ui_scripts}/menu_mods/__init__.lua (100%) rename {ui_scripts => data/ui_scripts}/menu_xboxlive/__init__.lua (100%) rename {ui_scripts => data/ui_scripts}/mp_live_public_lobby/__init__.lua (100%) rename {ui_scripts => data/ui_scripts}/server_filter/__init__.lua (100%) rename {ui_scripts => data/ui_scripts}/server_list/__init__.lua (100%) rename {ui_scripts => data/ui_scripts}/stats/__init__.lua (100%) rename {ui_scripts => data/ui_scripts}/string_override/__init__.lua (100%) rename {ui_scripts => data/ui_scripts}/team_select/__init__.lua (100%) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml new file mode 100644 index 0000000..8c8aad2 --- /dev/null +++ b/.gitea/workflows/ci.yml @@ -0,0 +1,70 @@ +name: ci + +on: [push] + +jobs: + lint: + name: Lint GSC files + runs-on: ubuntu-latest + steps: + - name: Install Git LFS + run: | + apt-get update + apt-get install -y git-lfs + git lfs install + + - name: Check out files + uses: actions/checkout@v4 + with: + submodules: true + fetch-depth: 0 + lfs: true + token: ${{ secrets.LFS_AUTH_TOKEN }} + + - name: Lint + uses: addnab/docker-run-action@v3 + with: + registry: gcr.io + image: xensik/gsc-tool:latest + options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} + run: | + cd ${{ github.workspace }} + gsc-tool --dry -m comp -g iw6 -s pc "maps" + gsc-tool --dry -m parse -g iw6 -s pc "scripts" + + deploy: + name: Deploy artifacts + needs: [lint] + runs-on: ubuntu-latest + if: github.event_name == 'push' && github.ref == 'refs/heads/main' + steps: + - name: Install dependencies + run: | + apt-get update + apt-get install -y rsync + + - name: Setup main environment + run: echo "ALTERWARE_MASTER_SERVER_PATH=${{ secrets.ALTERWARE_MASTER_SSH_PATH }}" >> $GITHUB_ENV + + - name: Download data artifacts + uses: actions/download-artifact@v4 + with: + name: data artifacts + + - name: Install SSH key + uses: shimataro/ssh-key-action@v2.7.0 + with: + key: ${{ secrets.ALTERWARE_MASTER_SSH_PRIVATE_KEY }} + known_hosts: 'just-a-placeholder-so-we-dont-get-errors' + + - name: Add known hosts + run: ssh-keyscan -H ${{ secrets.ALTERWARE_MASTER_SSH_ADDRESS }} >> ~/.ssh/known_hosts + + - name: Remove old data files + run: ssh ${{ secrets.ALTERWARE_MASTER_SSH_USER }}@${{ secrets.ALTERWARE_MASTER_SSH_ADDRESS }} rm -rf ${{ env.ALTERWARE_MASTER_SERVER_PATH }}/iw6/data/* + + - name: Upload data files + run: rsync -avz ./data/ ${{ secrets.ALTERWARE_MASTER_SSH_USER }}@${{ secrets.ALTERWARE_MASTER_SSH_ADDRESS }}:${{ env.ALTERWARE_MASTER_SERVER_PATH }}/iw6/data/ + + - name: Publish changes + run: ssh ${{ secrets.ALTERWARE_MASTER_SSH_USER }}@${{ secrets.ALTERWARE_MASTER_SSH_ADDRESS }} ${{ secrets.ALTERWARE_SSH_CHANGE_PUBLISH_COMMAND }} diff --git a/.gitea/workflows/lint.yml b/.gitea/workflows/lint.yml deleted file mode 100644 index 263b1f6..0000000 --- a/.gitea/workflows/lint.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: lint - -on: [push] - -jobs: - lint: - name: Lint GSC files - runs-on: ubuntu-latest - steps: - - name: Check out files - uses: actions/checkout@v4 - - - name: Lint - uses: addnab/docker-run-action@v3 - with: - registry: gcr.io - image: xensik/gsc-tool:latest - options: --volumes-from=${{ env.JOB_CONTAINER_NAME }} - run: | - cd ${{ github.workspace }} - gsc-tool --dry -m comp -g iw6 -s pc "maps" - gsc-tool --dry -m parse -g iw6 -s pc "scripts" diff --git a/LICENSE b/LICENSE index 232bfc2..eade6ef 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2024, AlterWare +Copyright (c) 2025, AlterWare All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/dw/entitlement_config_tu14.info b/data/dw/entitlement_config_tu14.info similarity index 100% rename from dw/entitlement_config_tu14.info rename to data/dw/entitlement_config_tu14.info diff --git a/dw/mm.cfg b/data/dw/mm.cfg similarity index 100% rename from dw/mm.cfg rename to data/dw/mm.cfg diff --git a/dw/newsfeed.txt b/data/dw/newsfeed.txt similarity index 100% rename from dw/newsfeed.txt rename to data/dw/newsfeed.txt diff --git a/dw/playlists_tu14.aggr b/data/dw/playlists_tu14.aggr similarity index 100% rename from dw/playlists_tu14.aggr rename to data/dw/playlists_tu14.aggr diff --git a/dw/social_tu14.cfg b/data/dw/social_tu14.cfg similarity index 100% rename from dw/social_tu14.cfg rename to data/dw/social_tu14.cfg diff --git a/maps/mp/alien/_drill.gsc b/data/maps/mp/alien/_drill.gsc similarity index 100% rename from maps/mp/alien/_drill.gsc rename to data/maps/mp/alien/_drill.gsc diff --git a/maps/mp/gametypes/_damage.gsc b/data/maps/mp/gametypes/_damage.gsc similarity index 100% rename from maps/mp/gametypes/_damage.gsc rename to data/maps/mp/gametypes/_damage.gsc diff --git a/maps/mp/gametypes/_gamelogic.gsc b/data/maps/mp/gametypes/_gamelogic.gsc similarity index 100% rename from maps/mp/gametypes/_gamelogic.gsc rename to data/maps/mp/gametypes/_gamelogic.gsc diff --git a/maps/mp/gametypes/_menus.gsc b/data/maps/mp/gametypes/_menus.gsc similarity index 100% rename from maps/mp/gametypes/_menus.gsc rename to data/maps/mp/gametypes/_menus.gsc diff --git a/maps/mp/gametypes/_playerlogic.gsc b/data/maps/mp/gametypes/_playerlogic.gsc similarity index 100% rename from maps/mp/gametypes/_playerlogic.gsc rename to data/maps/mp/gametypes/_playerlogic.gsc diff --git a/maps/mp/gametypes/aliens.gsc b/data/maps/mp/gametypes/aliens.gsc similarity index 100% rename from maps/mp/gametypes/aliens.gsc rename to data/maps/mp/gametypes/aliens.gsc diff --git a/maps/mp/mp_alien_beacon.gsc b/data/maps/mp/mp_alien_beacon.gsc similarity index 99% rename from maps/mp/mp_alien_beacon.gsc rename to data/maps/mp/mp_alien_beacon.gsc index dd22215..f7a7ace 100644 --- a/maps/mp/mp_alien_beacon.gsc +++ b/data/maps/mp/mp_alien_beacon.gsc @@ -2505,7 +2505,7 @@ _death_trigger_monitor() var_7 = "none"; var_8 = undefined; var_0 maps\mp\alien\_death::onplayerkilled( var_1, var_2, var_3, var_4, var_5, var_6, var_7, var_8 ); - logprint( "!!PLAYER WAS KILLED BY TRIGGER!! : " + var_0.name + " killed by death trigger at: " + var_0.origin + "\\n" ); + logprint( "!!PLAYER WAS KILLED BY TRIGGER!! : " + var_0.name + " killed by death trigger at: " + var_0.origin + "\n" ); } } } diff --git a/data/open_source_software_disclosure.txt b/data/open_source_software_disclosure.txt new file mode 100644 index 0000000..e1ec082 --- /dev/null +++ b/data/open_source_software_disclosure.txt @@ -0,0 +1,16 @@ +Open source software disclosure (effective as of October 18, 2023; subject to change) + +This list of open-source code identifies open source code within this AlterWare client, and is intended to be a disclosure of a particular point in time only. Accordingly, you are advised that the List may be updated from time to time. + +- asmjit zlib +- discord-rpc MIT +- gsc-tool GPL-3.0 +- GSL MIT +- libtomcrypt LibTom +- libtommath LibTom +- minhook BSD 3-Clause +- protobuf BSD 3-Clause +- rapidjson MIT +- udis86 BSD 2-Clause +- WinToast MIT +- zlib (custom license) diff --git a/scripts/mp/_patches.gsc b/data/scripts/mp/_patches.gsc similarity index 100% rename from scripts/mp/_patches.gsc rename to data/scripts/mp/_patches.gsc diff --git a/scripts/mp/_team_balance.gsc b/data/scripts/mp/_team_balance.gsc similarity index 100% rename from scripts/mp/_team_balance.gsc rename to data/scripts/mp/_team_balance.gsc diff --git a/sound/patch-3-music.flac b/data/sound/patch-3-music.flac similarity index 100% rename from sound/patch-3-music.flac rename to data/sound/patch-3-music.flac diff --git a/ui_scripts/end_game/__init__.lua b/data/ui_scripts/end_game/__init__.lua similarity index 100% rename from ui_scripts/end_game/__init__.lua rename to data/ui_scripts/end_game/__init__.lua diff --git a/ui_scripts/infect/__init__.lua b/data/ui_scripts/infect/__init__.lua similarity index 100% rename from ui_scripts/infect/__init__.lua rename to data/ui_scripts/infect/__init__.lua diff --git a/ui_scripts/main_menu/__init__.lua b/data/ui_scripts/main_menu/__init__.lua similarity index 100% rename from ui_scripts/main_menu/__init__.lua rename to data/ui_scripts/main_menu/__init__.lua diff --git a/ui_scripts/menu_mods/__init__.lua b/data/ui_scripts/menu_mods/__init__.lua similarity index 100% rename from ui_scripts/menu_mods/__init__.lua rename to data/ui_scripts/menu_mods/__init__.lua diff --git a/ui_scripts/menu_xboxlive/__init__.lua b/data/ui_scripts/menu_xboxlive/__init__.lua similarity index 100% rename from ui_scripts/menu_xboxlive/__init__.lua rename to data/ui_scripts/menu_xboxlive/__init__.lua diff --git a/ui_scripts/mp_live_public_lobby/__init__.lua b/data/ui_scripts/mp_live_public_lobby/__init__.lua similarity index 100% rename from ui_scripts/mp_live_public_lobby/__init__.lua rename to data/ui_scripts/mp_live_public_lobby/__init__.lua diff --git a/ui_scripts/server_filter/__init__.lua b/data/ui_scripts/server_filter/__init__.lua similarity index 100% rename from ui_scripts/server_filter/__init__.lua rename to data/ui_scripts/server_filter/__init__.lua diff --git a/ui_scripts/server_list/__init__.lua b/data/ui_scripts/server_list/__init__.lua similarity index 100% rename from ui_scripts/server_list/__init__.lua rename to data/ui_scripts/server_list/__init__.lua diff --git a/ui_scripts/stats/__init__.lua b/data/ui_scripts/stats/__init__.lua similarity index 100% rename from ui_scripts/stats/__init__.lua rename to data/ui_scripts/stats/__init__.lua diff --git a/ui_scripts/string_override/__init__.lua b/data/ui_scripts/string_override/__init__.lua similarity index 100% rename from ui_scripts/string_override/__init__.lua rename to data/ui_scripts/string_override/__init__.lua diff --git a/ui_scripts/team_select/__init__.lua b/data/ui_scripts/team_select/__init__.lua similarity index 100% rename from ui_scripts/team_select/__init__.lua rename to data/ui_scripts/team_select/__init__.lua