Skip to content

Use bokken runner for windows builds #1174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2019
+43 −12
Merged

Use bokken runner for windows builds #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 33 additions & 12 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,20 @@ build_android:
build_win:
stage: build
tags:
- buildfarm
- windows
- bokken-job
variables:
BOKKEN_VM: build_win_vm
BOKKEN_JOB: |
resources:
- name: build_win_vm
image: platform-foundation/windows-mono-bokken:latest
flavor: b1.xlarge
type: Unity::VM
script:
- git submodule update --init --recursive
- perl external/buildscripts/build_runtime_win64.pl --stevedorebuilddeps=1
- mkdir -p incomingbuilds/win64
- cp -r builds/* incomingbuilds/win64/
- powershell mkdir -p incomingbuilds/win64
- powershell cp -r builds/* incomingbuilds/win64/
artifacts:
paths:
- incomingbuilds/win64
Expand All @@ -137,13 +144,20 @@ build_win:
build_win_x86:
stage: build
tags:
- buildfarm
- windows
- bokken-job
variables:
BOKKEN_VM: build_win_x86_vm
BOKKEN_JOB: |
resources:
- name: build_win_x86_vm
image: platform-foundation/windows-mono-bokken:latest
flavor: b1.xlarge
type: Unity::VM
script:
- git submodule update --init --recursive
- perl external/buildscripts/build_runtime_win.pl --stevedorebuilddeps=1
- mkdir -p incomingbuilds/win32
- cp -r builds/* incomingbuilds/win32/
- powershell mkdir -p incomingbuilds/win32
- powershell cp -r builds/* incomingbuilds/win32/
artifacts:
paths:
- incomingbuilds/win32
Expand All @@ -155,13 +169,20 @@ build_win_x86:
build_win_bare_minimum:
stage: build
tags:
- buildfarm
- windows
- bokken-job
variables:
BOKKEN_VM: build_win_bare_minimum
BOKKEN_JOB: |
resources:
- name: build_win_bare_minimum
image: platform-foundation/windows-mono-bokken:latest
flavor: b1.xlarge
type: Unity::VM
script:
- git submodule update --init --recursive
- perl external/buildscripts/build_unityscript_bareminimum_win.pl
- mkdir -p incomingbuilds/bareminimum
- cp -r builds/* incomingbuilds/bareminimum/
- powershell mkdir -p incomingbuilds/bareminimum
- powershell cp -r builds/* incomingbuilds/bareminimum/
artifacts:
paths:
- incomingbuilds/bareminimum
Expand Down
5 changes: 5 additions & 0 deletions external/buildscripts/build_runtime_vs.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ sub CompileVCProj
my $config;

my $msbuild = $ENV{"ProgramFiles(x86)"}."/MSBuild/$msBuildVersion/Bin/MSBuild.exe";

if ((! -d $extraBuildTools) || ($ENV{YAMATO_PROJECT_ID}) || ($ENV{USERNAME} == "bokken"))
Copy link
Author

@ashwinimurt ashwinimurt May 8, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We want to use 15.0 on Yamato (where YAMATO_PROJECT_ID is set) and GitLabCI Bokken runners (where username is "bokken").

Buildfarm runners have 14.0.

{
$msbuild = $ENV{"ProgramFiles(x86)"}."/Microsoft Visual Studio/2017/Professional/MSBuild/15.0/Bin/MSBuild.exe";
}

$config = $debug ? "Debug" : "Release";
my $arch = $arch32 ? "Win32" : "x64";
Expand Down
5 changes: 5 additions & 0 deletions external/buildscripts/build_win_no_cygwin.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
my $buildDeps = "";
my $stevedoreBuildDeps=1;
if($ENV{YAMATO_PROJECT_ID} || ($ENV{USERNAME} == "bokken"))
{
$msBuildVersion = "15.0";
}
print(">>> Build All Args = @ARGV\n");
GetOptions(
Expand Down