475 reactivate linux build (#477)

* Ensure that PK-Sim is installed from develop * WIP #475 reactivate linux build * WIP #475 reactivate linux build * WIP #475 reactivate linux build * WIP #475 reactivate linux build * Fixes #475 reactivate linux build
Open-Systems-Pharmacology · Mar 2, 2021 · 6bdc76d · 6bdc76d
1 parent ecb2bb4
commit 6bdc76d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -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)"
+  - 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
@@ -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
@@ -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\*

diff --git a/rakefile.rb b/rakefile.rb
@@ -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')
 end
 
 task :postclean do 
@@ -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
 
@@ -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}"
   }
-
+  puts "Patching #{description_file} with version #{version}".light_blue
   Utils.replace_tokens(replacement, description_file)
 end