Skip to content
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

475 reactivate linux build #477

Merged
merged 6 commits into from
Mar 2, 2021
Merged

475 reactivate linux build #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8233ed7
Ensure that PK-Sim is installed from develop
msevestre Mar 2, 2021
5b85872
WIP #475 reactivate linux build
msevestre Mar 2, 2021
6d3552f
WIP #475 reactivate linux build
msevestre Mar 2, 2021
62c19e0
WIP #475 reactivate linux build
msevestre Mar 2, 2021
b23d871
WIP #475 reactivate linux build
msevestre Mar 2, 2021
bd1c5c9
Fixes #475 reactivate linux build
msevestre Mar 2, 2021
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
20 changes: 11 additions & 9 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
image: Visual Studio 2019

version: '{build}'

# Download script file from GitHub
init:
ps: |
$ErrorActionPreference = "Stop"
Invoke-WebRequest http://raw.github.com/krlmlr/r-appveyor/master/scripts/appveyor-tool.ps1 -OutFile "..\appveyor-tool.ps1"
Import-Module '..\appveyor-tool.ps1'
- ps: Update-AppveyorBuild -Version "$($env:ospsuite_version).$($env:appveyor_build_version)"
Copy link
Member Author

Choose a reason for hiding this comment

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

@Yuri05 Unrelated but ensure that we are using the global version (suite component)

- ps: |
$ErrorActionPreference = "Stop"
Invoke-WebRequest http://raw.github.com/krlmlr/r-appveyor/master/scripts/appveyor-tool.ps1 -OutFile "..\appveyor-tool.ps1"
Import-Module '..\appveyor-tool.ps1'

install:
- ps: Bootstrap
- git submodule update --init --recursive

environment:
app_version: "10.0"
USE_RTOOLS: true
NOT_CRAN: true
KEEP_VIGNETTES: true
Expand All @@ -21,7 +23,7 @@ environment:
COVERALLS_TOKEN:
secure: xIz/WZT0ex3bs/CMBJTzzdXLhl3sqfSqJ3MshlSY03pZKuyYQN7Z1FprVgnlFMUZ

version: "$(app_version).{build}"


before_build:
- nuget sources add -name utility -source https://ci.appveyor.com/nuget/ospsuite-utility
Expand Down Expand Up @@ -51,9 +53,9 @@ on_success:
test_script:
- travis-tool.sh run_tests

# after_test:
# - rake "create_linux_build[%APPVEYOR_BUILD_VERSION%, %APPVEYOR_BUILD_FOLDER%, ubuntu18]"
# - rake "create_linux_build[%APPVEYOR_BUILD_VERSION%, %APPVEYOR_BUILD_FOLDER%, centOS7]"
after_test:
- rake "create_linux_build[%APPVEYOR_BUILD_VERSION%, %APPVEYOR_BUILD_FOLDER%, ubuntu18]"
- rake "create_linux_build[%APPVEYOR_BUILD_VERSION%, %APPVEYOR_BUILD_FOLDER%, centOS7]"

on_failure:
- 7z a failure.zip *.Rcheck\*
Expand Down
8 changes: 4 additions & 4 deletions rakefile.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@

task :prepare_for_build, [:product_version] do |t, args|
product_version = sanitized_version(args.product_version)

copy_files_to_lib_folder

update_package_version(product_version)

install_pksim('feature/relative_expression_redesign')
install_pksim('develop')
Copy link
Member Author

Choose a reason for hiding this comment

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

@Yuri05 Done

end

task :postclean do
Expand All @@ -29,6 +28,7 @@
# This task is temporary until we have an automated linux build
task :create_linux_build, [:product_version, :build_dir, :linux_distro] do |t, args|
product_version = sanitized_version(args.product_version)

build_dir = args.build_dir
linux_distro = args.linux_distro

Expand Down Expand Up @@ -168,9 +168,9 @@ def sanitized_version(version)
def update_package_version(version)
#Replace token Version: x.y.z with the version from appveyor
replacement = {
/Version: \d\.\d\.\d/ => "Version: #{version}"
/Version: \d+\.\d+\.\d+/ => "Version: #{version}"
Copy link
Member Author

Choose a reason for hiding this comment

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

Reged. .was parsing 9.x.z but not 10.x.z...

Copy link
Member

Choose a reason for hiding this comment

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

lol

}

puts "Patching #{description_file} with version #{version}".light_blue
Utils.replace_tokens(replacement, description_file)
end

Expand Down