diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index d4c114b0..97fc5b21 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -25,7 +25,7 @@ jobs: - name: Install packaging dependencies run: | - sudo apt install -y python3 python3-dev python3-pip python3-venv python3-all dh-python debhelper devscripts dput software-properties-common python3-distutils python3-setuptools python3-wheel python3-stdeb + sudo apt install -y python3 python3-dev python3-pip python3-venv python3-all dh-python debhelper devscripts dput software-properties-common python3-distutils python3-setuptools python3-wheel python3-stdeb curl wget # pip3 install --upgrade pip setuptools wheel stdeb - name: Build Debian/Apt sdist_dsc @@ -42,12 +42,21 @@ jobs: cd deb_dist/ sudo apt install ./archivebox*.deb - - name: Add some links to test + - name: Check ArchiveBox version run: | + # must create dir needed for snaps to run as non-root on github actions + sudo mkdir -p /run/user/1001 && sudo chmod -R 777 /run/user/1001 mkdir "${{ github.workspace }}/data" && cd "${{ github.workspace }}/data" archivebox init - archivebox add 'https://example.com' + archivebox config --set SAVE_READABILITY=False + archivebox config --set SAVE_MERCURY=False + archivebox config --set SAVE_SINGLEFILE=False archivebox version + + - name: Add some links to test + run: | + cd "${{ github.workspace }}/data" + archivebox add 'https://example.com' archivebox status # - name: Commit files diff --git a/archivebox/config.py b/archivebox/config.py index 75c4cb96..a3444f07 100644 --- a/archivebox/config.py +++ b/archivebox/config.py @@ -334,8 +334,6 @@ DERIVED_CONFIG_DEFAULTS: ConfigDefaultDict = { 'USE_CHROME': {'default': lambda c: c['USE_CHROME'] and (c['SAVE_PDF'] or c['SAVE_SCREENSHOT'] or c['SAVE_DOM'] or c['SAVE_SINGLEFILE'])}, 'CHROME_BINARY': {'default': lambda c: c['CHROME_BINARY'] if c['CHROME_BINARY'] else find_chrome_binary()}, 'CHROME_VERSION': {'default': lambda c: bin_version(c['CHROME_BINARY']) if c['USE_CHROME'] else None}, - 'USE_NODE': {'default': lambda c: c['USE_NODE'] and (c['SAVE_READABILITY'] or c['SAVE_SINGLEFILE'])}, - 'NODE_VERSION': {'default': lambda c: bin_version(c['NODE_BINARY']) if c['USE_NODE'] else None}, 'SAVE_PDF': {'default': lambda c: c['USE_CHROME'] and c['SAVE_PDF']}, 'SAVE_SCREENSHOT': {'default': lambda c: c['USE_CHROME'] and c['SAVE_SCREENSHOT']}, @@ -343,6 +341,9 @@ DERIVED_CONFIG_DEFAULTS: ConfigDefaultDict = { 'SAVE_SINGLEFILE': {'default': lambda c: c['USE_CHROME'] and c['SAVE_SINGLEFILE'] and c['USE_NODE']}, 'SAVE_READABILITY': {'default': lambda c: c['USE_READABILITY'] and c['USE_NODE']}, 'SAVE_MERCURY': {'default': lambda c: c['USE_MERCURY'] and c['USE_NODE']}, + + 'USE_NODE': {'default': lambda c: c['USE_NODE'] and (c['SAVE_READABILITY'] or c['SAVE_SINGLEFILE'] or c['SAVE_MERCURY'])}, + 'NODE_VERSION': {'default': lambda c: bin_version(c['NODE_BINARY']) if c['USE_NODE'] else None}, 'DEPENDENCIES': {'default': lambda c: get_dependency_info(c)}, 'CODE_LOCATIONS': {'default': lambda c: get_code_locations(c)},