From d598f33e74c6b79b22fe557d6ec2d5f391ef48f4 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 17:13:13 +0000 Subject: [PATCH 1/9] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64c5696..a867186 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,9 +98,9 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: - - 'ls -l ../../../rjw/1.5/Assemblies/RJW.dll' - - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../../rjw/1.5/Assemblies/RJW.dll' - - 'ls -l ../../../rjw/1.5/Assemblies/RJW.dll' + - 'ls -l ../../rjw/1.5/Assemblies/RJW.dll' + - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../rjw/1.5/Assemblies/RJW.dll' + - 'ls -l ../../rjw/1.5/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From 45e84a83fcc0eda16ef33f0604bf7740a736d38d Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 17:43:57 +0000 Subject: [PATCH 2/9] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a867186..73c021d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,9 +98,7 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: - - 'ls -l ../../rjw/1.5/Assemblies/RJW.dll' - - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../rjw/1.5/Assemblies/RJW.dll' - - 'ls -l ../../rjw/1.5/Assemblies/RJW.dll' + - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../rjw/1.4/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From 79a3dc684b2c7468a40b69eda58c90dc3bcb3d4c Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 18:01:08 +0000 Subject: [PATCH 3/9] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73c021d..3bb83f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ image: mcr.microsoft.com/dotnet/sdk:latest # variables: # 1) Name of directory where restore and build objects are stored. - OBJECTS_DIRECTORY: 'obj' + OBJECTS_DIRECTORY: 'IdeologyAddon/obj' # 2) Name of directory used for keeping restored dependencies. NUGET_PACKAGES_DIRECTORY: '.nuget' # 3) A relative path to the source code from project repository root. @@ -98,7 +98,7 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: - - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../rjw/1.4/Assemblies/RJW.dll' + - 'curl --create-dirs "$RJW_DLL_URL" -o ../../rjw/1.4/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From b2fae1c39ca4468ad3d47fd68cce2f14f609ec5c Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 18:05:08 +0000 Subject: [PATCH 4/9] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3bb83f0..684ed48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,6 +98,7 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: + - 'echo $RJW_DLL_URL' - 'curl --create-dirs "$RJW_DLL_URL" -o ../../rjw/1.4/Assemblies/RJW.dll' - 'dotnet build --no-restore' From 332a65eb7d6e3a92a89b5a093f0b3d31e078258a Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 18:06:38 +0000 Subject: [PATCH 5/9] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 684ed48..e778595 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,7 +99,7 @@ build: # Only one project path can be passed as a parameter to 'dotnet build' command. script: - 'echo $RJW_DLL_URL' - - 'curl --create-dirs "$RJW_DLL_URL" -o ../../rjw/1.4/Assemblies/RJW.dll' + - 'curl --create-dirs $RJW_DLL_URL -o ../../rjw/1.4/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From d39a01a96280e6ea5d91436976d02a6c10003457 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 18:10:59 +0000 Subject: [PATCH 6/9] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e778595..684ed48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,7 +99,7 @@ build: # Only one project path can be passed as a parameter to 'dotnet build' command. script: - 'echo $RJW_DLL_URL' - - 'curl --create-dirs $RJW_DLL_URL -o ../../rjw/1.4/Assemblies/RJW.dll' + - 'curl --create-dirs "$RJW_DLL_URL" -o ../../rjw/1.4/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From 8bd4d5cd14a3636442408a3490f1ed826665580e Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 18:24:24 +0000 Subject: [PATCH 7/9] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 684ed48..c848e73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,8 +98,7 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: - - 'echo $RJW_DLL_URL' - - 'curl --create-dirs "$RJW_DLL_URL" -o ../../rjw/1.4/Assemblies/RJW.dll' + - 'curl --create-dirs "$RJW_DLL_URL" -o ../../rjw/$RIMWORLD_VERSION/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From 8315e2b8bebed56383ae5c458533bfebab939264 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 18:29:44 +0000 Subject: [PATCH 8/9] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c848e73..444063f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,7 +85,7 @@ cache: # Learn more about GitLab cache: https://docs.gitlab.com/ee/ci/caching/index.html before_script: - 'cd $SOURCE_CODE_PATH' - - 'dotnet restore --packages $NUGET_PACKAGES_DIRECTORY' + - 'dotnet restore --packages ../$NUGET_PACKAGES_DIRECTORY' build: stage: build @@ -98,7 +98,7 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: - - 'curl --create-dirs "$RJW_DLL_URL" -o ../../rjw/$RIMWORLD_VERSION/Assemblies/RJW.dll' + - 'curl -s --create-dirs "$RJW_DLL_URL" -o ../../rjw/$RIMWORLD_VERSION/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From c748aa266ac15dd6e32bcc6fc93238b30a56eec3 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 18:34:50 +0000 Subject: [PATCH 9/9] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 444063f..37b5780 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,13 +90,6 @@ before_script: build: stage: build # ### Build all projects discovered from solution file. - # - # Note: this will fail if you have any projects in your solution that are not - # .NET Core-based projects (e.g. WCF service), which is based on .NET Framework, - # not .NET Core. In this scenario, you will need to build every .NET Core-based - # project by explicitly specifying a relative path to the directory - # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). - # Only one project path can be passed as a parameter to 'dotnet build' command. script: - 'curl -s --create-dirs "$RJW_DLL_URL" -o ../../rjw/$RIMWORLD_VERSION/Assemblies/RJW.dll' - 'dotnet build --no-restore'