mirror of
https://github.com/niess/python-appimage.git
synced 2026-03-14 12:20:14 +01:00
Add aarch64 to the update
This commit is contained in:
@@ -81,7 +81,10 @@ import os
|
||||
appdir = os.environ['APPDIR']
|
||||
env = {}
|
||||
for var in ('SSL_CERT_FILE', 'TCL_LIBRARY', 'TK_LIBRARY', 'TKPATH'):
|
||||
env[var] = os.environ[var].replace(appdir, '$APPDIR')
|
||||
try:
|
||||
env[var] = os.environ[var].replace(appdir, '$APPDIR')
|
||||
except KeyError:
|
||||
pass
|
||||
print(env)
|
||||
''').run(appimage))
|
||||
|
||||
@@ -149,7 +152,11 @@ print(env)
|
||||
content
|
||||
)
|
||||
content = self.list_content(f'{prefix}/include')
|
||||
assert_eq([f'python{self.version.flavoured()}'], content)
|
||||
if (self.version.major == 3) and (self.version.minor <= 7):
|
||||
expected = [f'python{self.version.short()}m']
|
||||
else:
|
||||
expected = [f'python{self.version.flavoured()}']
|
||||
assert_eq(expected, content)
|
||||
content = self.list_content(f'{prefix}/lib')
|
||||
assert_eq([f'python{self.version.flavoured()}'], content)
|
||||
return Status.SUCCESS
|
||||
@@ -171,10 +178,13 @@ print(env)
|
||||
def test_tcltk_bundling(self):
|
||||
'''Check Tcl/Tk bundling'''
|
||||
|
||||
for var in ('TCL_LIBRARY', 'TK_LIBRARY', 'TKPATH'):
|
||||
path = Path(self.env[var].replace('$APPDIR', str(self.appdir)))
|
||||
assert path.exists()
|
||||
return Status.SUCCESS
|
||||
if 'TK_LIBRARY' not in self.env:
|
||||
return Status.SKIPPED
|
||||
else:
|
||||
for var in ('TCL_LIBRARY', 'TK_LIBRARY', 'TKPATH'):
|
||||
path = Path(self.env[var].replace('$APPDIR', str(self.appdir)))
|
||||
assert path.exists()
|
||||
return Status.SUCCESS
|
||||
|
||||
def test_ssl_bundling(self):
|
||||
'''Check SSL certs bundling'''
|
||||
@@ -262,6 +272,7 @@ with urllib.request.urlopen('https://wikipedia.org') as r:
|
||||
|
||||
try:
|
||||
os.environ['DISPLAY']
|
||||
self.env['TK_LIBRARY']
|
||||
except KeyError:
|
||||
return Status.SKIPPED
|
||||
else:
|
||||
|
||||
@@ -16,9 +16,9 @@ from python_appimage.utils.manylinux import format_appimage_name, format_tag
|
||||
|
||||
|
||||
# Build matrix
|
||||
ARCHS = ('x86_64', 'i686')
|
||||
ARCHS = ('x86_64', 'i686', 'aarch64')
|
||||
MANYLINUSES = ('1', '2010', '2014', '2_24', '2_28')
|
||||
EXCLUDES = ('2_28_i686',)
|
||||
EXCLUDES = ('2_28_i686', '1_aarch64', '2010_aarch64')
|
||||
|
||||
# Build directory for AppImages
|
||||
APPIMAGES_DIR = 'build-appimages'
|
||||
@@ -202,7 +202,8 @@ def update(args):
|
||||
if new_assets:
|
||||
log('DRY', f'new update summary with {len(new_assets)} entries')
|
||||
|
||||
return
|
||||
if not args.build:
|
||||
return
|
||||
|
||||
if new_assets:
|
||||
# Build new AppImage(s)
|
||||
@@ -215,6 +216,9 @@ def update(args):
|
||||
finally:
|
||||
os.chdir(cwd)
|
||||
|
||||
if args.dry:
|
||||
return
|
||||
|
||||
# Create any new release(s).
|
||||
for tag in new_releases:
|
||||
meta = ReleaseMeta(tag)
|
||||
@@ -305,6 +309,11 @@ if __name__ == '__main__':
|
||||
action = 'store_true',
|
||||
default = False
|
||||
)
|
||||
parser.add_argument('-b', '--build',
|
||||
help = 'build AppImages (in dry mode)',
|
||||
action = 'store_true',
|
||||
default = False
|
||||
)
|
||||
parser.add_argument('-d', '--dry',
|
||||
help = 'dry run (only log changes)',
|
||||
action = 'store_true',
|
||||
|
||||
Reference in New Issue
Block a user