Skip to content

Commit 0628a8f

Browse files
authored
Merge pull request #990 from henilp105/fpm-registry
fix: update registry backend APIs and download functionality
2 parents 6bf8c23 + c4c0bb7 commit 0628a8f

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

src/fpm/cmd/publish.f90

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ subroutine cmd_publish(settings)
6767
tmp_file = get_temp_filename()
6868
call git_archive('.', tmp_file, 'HEAD', settings%verbose, error)
6969
if (allocated(error)) call fpm_stop(1, '*cmd_publish* Archive error: '//error%message)
70+
call model%dump('fpm_model.json', error, json=.true.)
71+
if (allocated(error)) call fpm_stop(1, '*cmd_publish* Model dump error: '//error%message)
7072

7173
upload_data = [ &
7274
& string_t('package_name="'//package%name//'"'), &

src/fpm/dependency.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ subroutine get_from_registry(self, target_dir, global_settings, error, downloade
696696
end if
697697

698698
! Include namespace and package name in the target url and download package data.
699-
target_url = global_settings%registry_settings%url//'/packages/'//self%namespace//'/'//self%name
699+
target_url = global_settings%registry_settings%url//'packages/'//self%namespace//'/'//self%name
700700
call downloader%get_pkg_data(target_url, self%requested_version, tmp_file, json, error)
701701
close (unit, status='delete')
702702
if (allocated(error)) return

src/fpm_command_line.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ subroutine set_help()
14701470
'DESCRIPTION', &
14711471
' Follow the steps to create a tarball and upload a package to the registry:', &
14721472
'', &
1473-
' 1. Register on the website (https://registry-frontend.vercel.app/).', &
1473+
' 1. Register on the website (https://registry-phi.vercel.app/).', &
14741474
' 2. Create a namespace. Uploaded packages must be assigned to a unique', &
14751475
' namespace to avoid conflicts among packages with similar names. A', &
14761476
' namespace can accommodate multiple packages.', &

src/fpm_settings.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module fpm_settings
1010
private
1111
public :: fpm_global_settings, get_global_settings, get_registry_settings, official_registry_base_url
1212

13-
character(*), parameter :: official_registry_base_url = 'https://registry-apis.vercel.app'
13+
character(*), parameter :: official_registry_base_url = 'https://fpm-registry.vercel.app'
1414
character(*), parameter :: default_config_file_name = 'config.toml'
1515

1616
type :: fpm_global_settings

0 commit comments

Comments
 (0)