Skip to content

Commit

Permalink
Bump version to 7.2.2 and points to expected hotfix branches
Browse files Browse the repository at this point in the history
  • Loading branch information
msevestre committed Feb 19, 2018
1 parent b6c3b7f commit f83dfab
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
environment:
app_version: '7.3.0'
app_version: '7.2.2'

version: '%app_version%.{build}'

Expand Down
18 changes: 11 additions & 7 deletions rakefile.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
VARIABLES[:ProductVersion] = @product_version
VARIABLES[:ProductFullVersion] = @product_full_version

MSI[:pksim] = create_package('pk-sim', 'PK-Sim')
MSI[:mobi] = create_package('mobi', 'MoBi')
MSI[:matlab] = create_package('matlab-toolbox', 'Matlab-Toolbox')
MSI[:r] = create_package('r-toolbox', 'R-Toolbox')
MSI[:validator] = create_package('installationvalidator', 'InstallationValidator')
MSI[:pksim] = create_package('pk-sim', 'PK-Sim', branch: 'hotfix/7.2.2')
MSI[:mobi] = create_package('mobi', 'MoBi', branch: 'hotfix/7.2.2')
MSI[:matlab] = create_package('matlab-toolbox', 'Matlab-Toolbox', uri: 'https://ci.appveyor.com/api/buildjobs/gk8wjvf5jmi9tsc1/artifacts/setup.zip')
MSI[:r] = create_package('r-toolbox', 'R-Toolbox', uri: 'https://ci.appveyor.com/api/buildjobs/efv1kw037tv3sfyj/artifacts/setup.zip')
MSI[:validator] = create_package('installationvalidator', 'InstallationValidator', branch: 'hotfix/7.2.2')

Rake::Task['downlad_all_packages'].invoke

Expand All @@ -51,7 +51,7 @@ def create_versions_file
end
end

def create_package(appveyor_project_name, git_repository, artifact_name: 'setup.zip', version: @product_version, branch: @branch_name)
def create_package(appveyor_project_name, git_repository, artifact_name: 'setup.zip', version: @product_version, branch: @branch_name, uri:nil)
compressed = artifact_name.include? '.zip'
git_repo = git_repository || appveyor_project_name

Expand All @@ -61,7 +61,8 @@ def create_package(appveyor_project_name, git_repository, artifact_name: 'setup
branch: branch,
compressed: compressed,
git_repository: git_repo,
version: version
version: version,
uri:uri
}
end

Expand Down Expand Up @@ -120,6 +121,9 @@ def prepare_msi(msi)
def download(package)
file_name = package[:artifact_name]
uri = "https://ci.appveyor.com/api/projects/#{APPVEYOR_ACCOUNT_NAME}/#{package[:appveyor_project_name]}/artifacts/#{file_name}?branch=#{package[:branch]}"

#Path of package is predefined. This is typically the case for a hotfix when some packages should be fixed
uri = package[:uri] if package[:uri]
download_file package[:appveyor_project_name], file_name, uri
end

Expand Down

0 comments on commit f83dfab

Please sign in to comment.