public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

discourse: update.py: Remove native platforms in plugin lock files..

Browse Source 
...and add ruby.

(cherry picked from commit 12ff4b79e48d9c4aa5660d2ec7ce52a21806d8e4)
This commit is contained in:
talyz 2021-08-13 19:00:23 +02:00
parent ba5434c984
commit 18902d1e12
No known key found for this signature in database
GPG Key ID: 2DED2151F4671A2B
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/servers/web-apps/discourse/update.py
View File

@ -116,6 +116,18 @@ def _diff_file(filepath: str, old_version: str, new_version: str):
return return
def _remove_platforms(rubyenv_dir: Path):
for platform in ['arm64-darwin-20', 'x86_64-darwin-18',
'x86_64-darwin-19', 'x86_64-darwin-20',
'x86_64-linux']:
with open(rubyenv_dir / 'Gemfile.lock', 'r') as f:
for line in f:
if platform in line:
subprocess.check_output(
['bundle', 'lock', '--remove-platform', platform], cwd=rubyenv_dir)
break
@click_log.simple_verbosity_option(logger) @click_log.simple_verbosity_option(logger)
@ -178,10 +190,7 @@ def update(rev):
f.write(repo.get_file(fn, rev)) f.write(repo.get_file(fn, rev))
subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir)
for platform in ['arm64-darwin-20', 'x86_64-darwin-18', _remove_platforms(rubyenv_dir)
'x86_64-darwin-19', 'x86_64-darwin-20',
'x86_64-linux']:
subprocess.check_output(['bundle', 'lock', '--remove-platform', platform], cwd=rubyenv_dir)
subprocess.check_output(['bundix'], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir)
_call_nix_update('discourse', repo.rev2version(rev)) _call_nix_update('discourse', repo.rev2version(rev))
@ -299,7 +308,9 @@ def update_plugins():
with open(gemfile, 'a') as f: with open(gemfile, 'a') as f:
f.write(gemfile_text) f.write(gemfile_text)
subprocess.check_output(['bundle', 'lock', '--add-platform', 'ruby'], cwd=rubyenv_dir)
subprocess.check_output(['bundle', 'lock', '--update'], cwd=rubyenv_dir) subprocess.check_output(['bundle', 'lock', '--update'], cwd=rubyenv_dir)
_remove_platforms(rubyenv_dir)
subprocess.check_output(['bundix'], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir)