mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-06-04 16:53:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove extra files from repo root and move package.json into etc

Browse source
This commit is contained in:
Nick Sweeting 2024-10-05 03:51:47 -07:00
parent 00a91e09c6
commit db10a2142e
No known key found for this signature in database
17 changed files with 44 additions and 6370 deletions
Download patch file Download diff file Expand all files Collapse all files

49
bin/build_dev.sh
View file

@ -1,49 +0,0 @@
#!/usr/bin/env bash
# ./bin/build_docker.sh dev 'linux/arm/v7'
### Bash Environment Setup
# http://redsymbol.net/articles/unofficial-bash-strict-mode/
# https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
# set -o xtrace
set -o errexit
set -o errtrace
set -o nounset
set -o pipefail
IFS=$'\n'
REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && pwd )"
cd "$REPO_DIR"
which docker > /dev/null || exit 1
TAG_NAME="${1:-$(git rev-parse --abbrev-ref HEAD)}"
VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")"
SHORT_VERSION="$(echo "$VERSION" | perl -pe 's/(\d+)\.(\d+)\.(\d+)/$1.$2/g')"
REQUIRED_PLATFORMS="${2:-"linux/arm64,linux/amd64,linux/arm/v7"}"
# Build python package lists
# https://pdm-project.org/latest/usage/lockfile/
echo "[+] Generating requirements.txt and pdm.lock from pyproject.toml..."
pdm lock --group=':all' --production --lockfile pdm.lock --strategy="cross_platform"
pdm sync --group=':all' --production --lockfile pdm.lock --clean || pdm sync --group=':all' --production --lockfile pdm.lock --clean
pdm export --group=':all' --production --lockfile pdm.lock --without-hashes -o requirements.txt
pdm lock --group=':all' --dev --lockfile pdm.dev.lock --strategy="cross_platform"
pdm sync --group=':all' --dev --lockfile pdm.dev.lock --clean || pdm sync --group=':all' --dev --lockfile pdm.dev.lock --clean
pdm export --group=':all' --dev --lockfile pdm.dev.lock --without-hashes -o requirements-dev.txt
echo "[+] Building Docker image: tag=$TAG_NAME version=$SHORT_VERSION arch=$REQUIRED_PLATFORMS"
echo "[+] Building archivebox:$VERSION docker image..."
# docker builder prune
docker build . --no-cache -t archivebox-dev --load
# docker buildx build --platform "$REQUIRED_PLATFORMS" --load . \
# -t archivebox \
# -t archivebox:$TAG_NAME \
# -t archivebox:$VERSION \
# -t archivebox:$SHORT_VERSION

2
bin/build_docker.sh
View file

@ -20,7 +20,7 @@ which jq > /dev/null || exit 1
declare -a TAG_NAMES="$*"
BRANCH_NAME="${1:-$(git rev-parse --abbrev-ref HEAD)}"
VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")"
VERSION="$(grep '^version = ' "${REPO_DIR}/pyproject.toml" | awk -F'"' '{print $2}')"
GIT_SHA=sha-"$(git rev-parse --short HEAD)"
SELECTED_PLATFORMS="linux/amd64,linux/arm64"

7
bin/build_git.sh
View file

@ -30,9 +30,6 @@ function bump_semver {
echo "$1" | awk -F. '{$NF = $NF + 1;} 1' | sed 's/ /./g'
}
OLD_VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")"
NEW_VERSION="$(bump_semver "$OLD_VERSION")"
echo "[*] Bumping VERSION from $OLD_VERSION to $NEW_VERSION"
contents="$(jq ".version = \"$NEW_VERSION\"" "$REPO_DIR/package.json")" && \
echo "${contents}" > package.json
# OLD_VERSION="$(grep '^version = ' "${REPO_DIR}/pyproject.toml" | awk -F'"' '{print $2}')"
# NEW_VERSION="$(bump_semver "$OLD_VERSION")"

57
bin/lock_pkgs.sh
View file

@ -15,17 +15,17 @@ REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && p
cd "$REPO_DIR"
py_version="$(grep -E '^version = ' pyproject.toml | awk '{print $3}' | jq -r)"
js_version="$(jq -r '.version' package.json)"
# js_version="$(jq -r '.version' ${REPO_DIR}/etc/package.json)"
if [[ "$py_version" != "$js_version" ]]; then
echo "[❌] Version in pyproject.toml ($py_version) does not match version in package.json ($js_version)!"
exit 1
fi
# if [[ "$py_version" != "$js_version" ]]; then
# echo "[❌] Version in pyproject.toml ($py_version) does not match version in etc/package.json ($js_version)!"
# exit 1
# fi
echo "[🔒] Locking all ArchiveBox dependencies (pip, npm)"
echo
echo "pyproject.toml: archivebox $py_version"
echo "package.json: archivebox $js_version"
# echo "package.json: archivebox $js_version"
echo
echo
@ -34,9 +34,9 @@ deactivate 2>/dev/null || true
rm -Rf build dist
rm -f uv.lock
rm -f requirements.txt
rm -f package-lock.json
rm -f archivebox/package.json
rm -f archivebox/package-lock.json
# rm -f package-lock.json
# rm -f archivebox/package.json
# rm -f archivebox/package-lock.json
# rm -Rf ./.venv
# rm -Rf ./node_modules
# rm -Rf ./archivebox/node_modules
@ -59,23 +59,20 @@ uv lock
uv pip compile pyproject.toml --all-extras -o requirements.txt >/dev/null
uv sync --all-extras --frozen 2>/dev/null
echo
echo "[+] Generating package-lock.json from package.json..."
npm install -g npm
npm config set fund false --location=global &
npm config set fund false &
npm config set audit false --location=global &
npm config set audit false &
echo
echo "package.json: archivebox $(jq -r '.version' package.json)"
echo
echo "$(which node): $(node --version | head -n 1)"
echo "$(which npm): $(npm --version | head -n 1)"
# echo
# echo "[+] Generating package-lock.json from etc/package.json..."
# npm install -g npm
# npm config set fund false --location=global
# npm config set audit false --location=global
# cd etc
# echo
# echo "etc/package.json: archivebox $(jq -r '.version' etc/package.json)"
# echo
# echo "$(which node): $(node --version | head -n 1)"
# echo "$(which npm): $(npm --version | head -n 1)"
echo
npm install --package-lock-only --prefer-offline
cp package.json archivebox/package.json
cp package-lock.json archivebox/package-lock.json
# echo
# npm install --package-lock-only --prefer-offline
echo
echo "[√] Finished. Don't forget to commit the new lockfiles:"
@ -83,8 +80,8 @@ echo
ls "pyproject.toml" | cat
ls "requirements.txt" | cat
ls "uv.lock" | cat
echo
ls "package.json" | cat
ls "package-lock.json" | cat
ls "archivebox/package.json" | cat
ls "archivebox/package-lock.json" | cat
# echo
# ls "package.json" | cat
# ls "package-lock.json" | cat
# ls "archivebox/package.json" | cat
# ls "archivebox/package-lock.json" | cat

2
bin/release.sh
View file

@ -30,5 +30,5 @@ cd "$REPO_DIR"
./bin/release_pip.sh
./bin/release_docker.sh
VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")"
VERSION="$(grep '^version = ' "${REPO_DIR}/pyproject.toml" | awk -F'"' '{print $2}')"
echo "[√] Done. Published version v$VERSION"

2
bin/release_docker.sh
View file

@ -15,7 +15,7 @@ cd "$REPO_DIR"
declare -a TAG_NAMES="$*"
BRANCH_NAME="${1:-$(git rev-parse --abbrev-ref HEAD)}"
VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")"
VERSION="$(grep '^version = ' "${REPO_DIR}/pyproject.toml" | awk -F'"' '{print $2}')"
GIT_SHA=sha-"$(git rev-parse --short HEAD)"
SELECTED_PLATFORMS="linux/amd64,linux/arm64"

2
bin/release_docs.sh
View file

@ -11,7 +11,7 @@ set -o pipefail
IFS=$'\n'
REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && pwd )"
VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")"
VERSION="$(grep '^version = ' "${REPO_DIR}/pyproject.toml" | awk -F'"' '{print $2}')"
cd "$REPO_DIR"

2
bin/release_git.sh
View file

@ -11,7 +11,7 @@ set -o pipefail
IFS=$'\n'
REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && pwd )"
VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")"
VERSION="$(grep '^version = ' "${REPO_DIR}/pyproject.toml" | awk -F'"' '{print $2}')"
cd "$REPO_DIR"