mirror of
https://github.com/agessaman/meshcore-bot.git
synced 2026-05-24 16:25:19 +00:00
fix(ci): restore frontend lockfile, satisfy ShellCheck, add schedule dep
This commit is contained in:
+1
-1
@@ -163,7 +163,7 @@ npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
.npm
|
||||
package-lock.json
|
||||
# package-lock.json is committed for reproducible npm ci in CI
|
||||
# keep package.json, .eslintrc.json, .htmlhintrc (committed)
|
||||
|
||||
# .deb build artifacts
|
||||
|
||||
+2
-4
@@ -404,14 +404,12 @@ EOF
|
||||
fi
|
||||
elif ! grep -q "^DOCKER_IMAGE_TAG=" "$ENV_FILE" 2>/dev/null; then
|
||||
# .env exists but doesn't have the tag - append it
|
||||
{
|
||||
if {
|
||||
echo ""
|
||||
echo "# Docker image configuration (auto-generated by docker-setup.sh)"
|
||||
echo "DOCKER_IMAGE_REGISTRY=$DOCKER_IMAGE_REGISTRY"
|
||||
echo "DOCKER_IMAGE_TAG=$DOCKER_IMAGE_TAG"
|
||||
} >> "$ENV_FILE"
|
||||
_rc=$?
|
||||
if [ $_rc -eq 0 ]; then
|
||||
} >> "$ENV_FILE"; then
|
||||
echo " ✓ Added Docker image configuration to .env file with tag: $DOCKER_IMAGE_TAG"
|
||||
else
|
||||
echo " ⚠️ Warning: Failed to append to .env file"
|
||||
|
||||
Generated
+1573
File diff suppressed because it is too large
Load Diff
@@ -15,6 +15,7 @@ dependencies = [
|
||||
"asyncio-mqtt>=0.11.0",
|
||||
"configparser>=5.3.0",
|
||||
"python-dateutil>=2.8.2",
|
||||
"schedule>=1.2.0",
|
||||
"apscheduler>=3.10.0",
|
||||
"colorlog>=6.7.0",
|
||||
"requests>=2.31.0",
|
||||
|
||||
Regular → Executable
+14
-10
@@ -22,12 +22,14 @@ WHEEL_FILE="$(ls "${DIST_DIR}/_pkgcheck"/*.whl | head -n 1)"
|
||||
SDIST_FILE="$(ls "${DIST_DIR}/_pkgcheck"/*.tar.gz | head -n 1)"
|
||||
|
||||
echo "==> Inspecting wheel: $(basename "${WHEEL_FILE}")"
|
||||
if ! python3 - <<'PY' "${WHEEL_FILE}" "${TARGET_ASSET}"; then
|
||||
import sys
|
||||
export _PKGDATA_WHEEL="${WHEEL_FILE}"
|
||||
export _PKGDATA_TARGET="${TARGET_ASSET}"
|
||||
python3 <<'PY' || exit 1
|
||||
import os
|
||||
import zipfile
|
||||
|
||||
wheel_path = sys.argv[1]
|
||||
target = sys.argv[2]
|
||||
wheel_path = os.environ["_PKGDATA_WHEEL"]
|
||||
target = os.environ["_PKGDATA_TARGET"]
|
||||
|
||||
with zipfile.ZipFile(wheel_path, "r") as zf:
|
||||
names = set(zf.namelist())
|
||||
@@ -36,15 +38,17 @@ with zipfile.ZipFile(wheel_path, "r") as zf:
|
||||
raise SystemExit(1)
|
||||
print("OK: wheel contains target asset")
|
||||
PY
|
||||
fi
|
||||
unset _PKGDATA_WHEEL _PKGDATA_TARGET
|
||||
|
||||
echo "==> Inspecting sdist: $(basename "${SDIST_FILE}")"
|
||||
if ! python3 - <<'PY' "${SDIST_FILE}" "${TARGET_ASSET}"; then
|
||||
import sys
|
||||
export _PKGDATA_SDIST="${SDIST_FILE}"
|
||||
export _PKGDATA_TARGET="${TARGET_ASSET}"
|
||||
python3 <<'PY' || exit 1
|
||||
import os
|
||||
import tarfile
|
||||
|
||||
sdist_path = sys.argv[1]
|
||||
target_suffix = "/" + sys.argv[2]
|
||||
sdist_path = os.environ["_PKGDATA_SDIST"]
|
||||
target_suffix = "/" + os.environ["_PKGDATA_TARGET"]
|
||||
|
||||
with tarfile.open(sdist_path, "r:gz") as tf:
|
||||
names = tf.getnames()
|
||||
@@ -53,6 +57,6 @@ with tarfile.open(sdist_path, "r:gz") as tf:
|
||||
raise SystemExit(1)
|
||||
print("OK: sdist contains target asset")
|
||||
PY
|
||||
fi
|
||||
unset _PKGDATA_SDIST _PKGDATA_TARGET
|
||||
|
||||
echo "==> Package-data check passed"
|
||||
|
||||
@@ -25,7 +25,7 @@ IS_LINUX=false
|
||||
|
||||
if [[ "$OS" == "Darwin" ]]; then
|
||||
IS_MACOS=true
|
||||
SERVICE_TYPE="launchd"
|
||||
_SERVICE_TYPE="launchd" # launchd (macOS); reserved for future diagnostics
|
||||
elif [[ "$OS" == "Linux" ]]; then
|
||||
IS_LINUX=true
|
||||
else
|
||||
@@ -40,7 +40,7 @@ PLIST_NAME="com.meshcore.bot"
|
||||
|
||||
if [[ "$IS_MACOS" == true ]]; then
|
||||
SERVICE_USER="$(whoami)"
|
||||
SERVICE_GROUP="staff"
|
||||
_SERVICE_GROUP="staff" # default macOS group; reserved for future ownership hints
|
||||
INSTALL_DIR="/usr/local/meshcore-bot"
|
||||
LOG_DIR="/usr/local/var/log/meshcore-bot"
|
||||
SERVICE_FILE="com.meshcore.bot.plist"
|
||||
|
||||
Reference in New Issue
Block a user