From 3578414c30f14a730de6c47f2f1a58e25293e8c7 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Thu, 16 Jul 2020 10:09:13 +0200 Subject: [PATCH] remove LHCI_REPO_NAME --- CHANGELOG.md | 3 ++- README.md | 5 ++--- overlay/usr/bin/lhci | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 343b317..8840be3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,2 @@ -- initial release +- ENHANCEMENT + - remove `LHCI_REPO_NAME`, could be handled within the CI diff --git a/README.md b/README.md index 15d1f68..731ac14 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ There are two wrapper scripts around the lhci command you could use: The wrapper `/usr/bin/lhci` will do the following: -- create `DIST=$LHCI_BASE_DIR/$UPLOAD_OUTPUT_DIR/dist/$LHCI_REPO_NAME` +- create `DIST=$LHCI_BASE_DIR/$UPLOAD_OUTPUT_DIR/dist/` - find all files flagged with `isRepresentativeRun` in the `manifest.json` - copy those files to `$DIST` @@ -34,7 +34,7 @@ ci: What you will get is the following file structure which could be used as an upload source: ```Shell -lhci_reports/dist/$REPO_NAME/ +lhci_reports/dist/ ├── 9cf658e2-202007160745.html ├── f33fa4c4-202007160745.html └── ffae8d3e-202007160745.html @@ -74,7 +74,6 @@ docker run -v $(pwd)/public:/drone/src lhci autorun --upload.target=temporary-pu ```Shell LHCI_BASE_DIR="/drone/src" LHCI_SERVER_URL="https://example.com/" -LHCI_REPO_NAME=$DRONE_REO_NAME ``` ## Build diff --git a/overlay/usr/bin/lhci b/overlay/usr/bin/lhci index 2c33f89..60db478 100755 --- a/overlay/usr/bin/lhci +++ b/overlay/usr/bin/lhci @@ -12,7 +12,7 @@ if [ -f "$CONFIG" ]; then if [ "${UPLOAD_TARGET}" = "filesystem" ] && [ -n "${UPLOAD_OUTPUT_DIR}" ] ; then MANIFEST=${UPLOAD_OUTPUT_DIR%/}/manifest.json - DIST="${LHCI_BASE_DIR%/}/${UPLOAD_OUTPUT_DIR%/}/dist/${LHCI_REPO_NAME}" + DIST="${LHCI_BASE_DIR%/}/${UPLOAD_OUTPUT_DIR%/}/dist" mkdir -p "${DIST}" printf "\nPost-process report files...\n"