Skip to content

Commit

Permalink
Merge branch 'master-ru' of git.arumoon.ru:Workbench-Team/space-stati…
Browse files Browse the repository at this point in the history
…on-14 into arumoon-server
  • Loading branch information
AruMoon committed Aug 21, 2023
2 parents 21d0bbc + 4bc5869 commit eb975e5
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: mcr.microsoft.com/dotnet/sdk:7.0
image: registry.git.arumoon.ru/arumoon/ss14-build-image:latest

stages:
- test
Expand All @@ -8,8 +8,6 @@ test-debug:
stage: test
retry: 2
script:
- apt update && apt upgrade -y
- apt install -y python3 libfreetype6
- mkdir .git/hooks -p
- python3 RUN_THIS.py
- dotnet restore
Expand All @@ -22,8 +20,6 @@ test-release:
stage: test
retry: 2
script:
- apt update && apt upgrade -y
- apt install -y python3 libfreetype6
- mkdir .git/hooks -p
- python3 RUN_THIS.py
- dotnet restore
Expand All @@ -38,9 +34,8 @@ publish:
interruptible: true
rules:
- if: '$SSH_PRIVATE_KEY != null && $SSH_REMOTE_IP != null && $SSH_USER != null'
- if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"'
script:
- apt update && apt upgrade -y
- apt install -y python3 libfreetype6 openssh-client rsync
- 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
Expand Down Expand Up @@ -69,8 +64,6 @@ publish-artifact:
rules:
- if: '$SSH_PRIVATE_KEY == null'
script:
- apt update && apt upgrade -y
- apt install -y python3 libfreetype6 openssh-client rsync
- 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.
Expand Down

0 comments on commit eb975e5

Please sign in to comment.