From adaf3e3ee2c036a4ae97d0e27b8e78917df66746 Mon Sep 17 00:00:00 2001 From: AruMoon Date: Fri, 1 Sep 2023 04:54:47 +0500 Subject: [PATCH] ci: remove useless commands and artifacts --- .gitlab-ci.yml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c4e134dd6d67c..7438fc5268e69f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,24 +42,16 @@ publish: script: - mkdir .git/hooks -p - python3 RUN_THIS.py - - Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64 > server_build.log - - Tools/package_client_build.py > client_build.log + - Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64 + - Tools/package_client_build.py - Tools/gen_build_info.py - mkdir release/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA - mv release/*.zip release/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA - eval $(ssh-agent -s) - ssh-add - <<< "${SSH_PRIVATE_KEY}" - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - ssh-keyscan $SSH_REMOTE_IP >> ~/.ssh/known_hosts - - chmod 644 ~/.ssh/known_hosts - rsync -avz release/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA $SSH_USER@$SSH_REMOTE_IP:~/builds/builds/ - ssh $SSH_USER@$SSH_REMOTE_IP "~/push.ps1 $CI_COMMIT_REF_NAME-$CI_COMMIT_SHA $CI_COMMIT_REF_NAME" - artifacts: - name: "Build logs $CI_COMMIT_REF_NAME" - paths: - - server_build.log - - client_build.log publish-artifact: stage: publish @@ -71,9 +63,8 @@ publish-artifact: - mkdir .git/hooks -p - python3 RUN_THIS.py # We create artifact only for Windows and x64 Linux, because almost noone uses OSX and Linux on arm for development among our contributors. This will save for us some amount of storage. You can just add osx-x64 or linux-arm64 if you really need it. - - Tools/package_server_build.py -p win-x64 linux-x64 --hybrid-acz > server_build.log + - Tools/package_server_build.py -p win-x64 linux-x64 --hybrid-acz artifacts: - name: "$CI_COMMIT_SHA" + name: "$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" paths: - - release - - server_build.log + - release/SS14.Server_*