luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CI: Replace "…" with "..."

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2023-04-23 09:27:45 +02:00
parent 8517c82cb7
commit dc66625350
7 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Makefile
View file

@ -84,7 +84,7 @@ logs:
help: help:
@echo "For build instructions, visit <https://docs.photoprism.app/developer-guide/>." @echo "For build instructions, visit <https://docs.photoprism.app/developer-guide/>."
fix-permissions: fix-permissions:
$(info Updating filesystem permissions…) $(info Updating filesystem permissions...)
@if [ $(UID) != 0 ]; then\ @if [ $(UID) != 0 ]; then\
echo "Running \"chown --preserve-root -Rcf $(UID):$(GID) /go /photoprism /opt/photoprism /tmp/photoprism\". Please wait."; \ echo "Running \"chown --preserve-root -Rcf $(UID):$(GID) /go /photoprism /opt/photoprism /tmp/photoprism\". Please wait."; \
sudo chown --preserve-root -Rcf $(UID):$(GID) /go /photoprism /opt/photoprism /tmp/photoprism || true;\ sudo chown --preserve-root -Rcf $(UID):$(GID) /go /photoprism /opt/photoprism /tmp/photoprism || true;\
@ -106,10 +106,10 @@ clean:
[ ! -d "$(BUILD_PATH)" ] || rm -rf --preserve-root $(BUILD_PATH) [ ! -d "$(BUILD_PATH)" ] || rm -rf --preserve-root $(BUILD_PATH)
[ ! -d "$(JS_BUILD_PATH)" ] || rm -rf --preserve-root $(JS_BUILD_PATH) [ ! -d "$(JS_BUILD_PATH)" ] || rm -rf --preserve-root $(JS_BUILD_PATH)
tar.gz: tar.gz:
$(info Creating tar.gz archives from the directories in "$(BUILD_PATH)"…) $(info Creating tar.gz archives from the directories in "$(BUILD_PATH)"...)
find "$(BUILD_PATH)" -maxdepth 1 -mindepth 1 -type d -exec tar --exclude='.[^/]*' -C {} -czf {}.tar.gz . \; find "$(BUILD_PATH)" -maxdepth 1 -mindepth 1 -type d -exec tar --exclude='.[^/]*' -C {} -czf {}.tar.gz . \;
install: install:
$(info Installing in "$(DESTDIR)"…) $(info Installing in "$(DESTDIR)"...)
@[ ! -d "$(DESTDIR)" ] || (echo "ERROR: Install path '$(DESTDIR)' already exists!"; exit 1) @[ ! -d "$(DESTDIR)" ] || (echo "ERROR: Install path '$(DESTDIR)' already exists!"; exit 1)
mkdir --mode=$(INSTALL_MODE) -p $(DESTDIR) mkdir --mode=$(INSTALL_MODE) -p $(DESTDIR)
env TMPDIR="$(BUILD_PATH)" ./scripts/dist/install-tensorflow.sh $(DESTDIR) env TMPDIR="$(BUILD_PATH)" ./scripts/dist/install-tensorflow.sh $(DESTDIR)
@ -228,46 +228,46 @@ build-tensorflow-arm64:
watch-js: watch-js:
(cd frontend && env NODE_ENV=development npm run watch) (cd frontend && env NODE_ENV=development npm run watch)
test-js: test-js:
$(info Running JS unit tests…) $(info Running JS unit tests...)
(cd frontend && env TZ=UTC NODE_ENV=development BABEL_ENV=test npm run test) (cd frontend && env TZ=UTC NODE_ENV=development BABEL_ENV=test npm run test)
acceptance: acceptance:
$(info Running public-mode tests in 'chromium:headless'…) $(info Running public-mode tests in 'chromium:headless'...)
(cd frontend && npm run testcafe -- chrome:headless --test-grep "^(Common|Core)\:*" --test-meta mode=public --config-file ./testcaferc.json "tests/acceptance") (cd frontend && npm run testcafe -- chrome:headless --test-grep "^(Common|Core)\:*" --test-meta mode=public --config-file ./testcaferc.json "tests/acceptance")
acceptance-short: acceptance-short:
$(info Running JS acceptance tests in Chrome…) $(info Running JS acceptance tests in Chrome...)
(cd frontend && npm run testcafe -- chrome:headless --test-grep "^(Common|Core)\:*" --test-meta mode=public,type=short --config-file ./testcaferc.json "tests/acceptance") (cd frontend && npm run testcafe -- chrome:headless --test-grep "^(Common|Core)\:*" --test-meta mode=public,type=short --config-file ./testcaferc.json "tests/acceptance")
acceptance-firefox: acceptance-firefox:
$(info Running JS acceptance tests in Firefox…) $(info Running JS acceptance tests in Firefox...)
(cd frontend && npm run testcafe -- firefox:headless --test-grep "^(Common|Core)\:*" --test-meta mode=public --config-file ./testcaferc.json "tests/acceptance") (cd frontend && npm run testcafe -- firefox:headless --test-grep "^(Common|Core)\:*" --test-meta mode=public --config-file ./testcaferc.json "tests/acceptance")
acceptance-auth: acceptance-auth:
$(info Running JS acceptance-auth tests in Chrome…) $(info Running JS acceptance-auth tests in Chrome...)
(cd frontend && npm run testcafe -- chrome:headless --test-grep "^(Common|Core)\:*" --test-meta mode=auth --config-file ./testcaferc.json "tests/acceptance") (cd frontend && npm run testcafe -- chrome:headless --test-grep "^(Common|Core)\:*" --test-meta mode=auth --config-file ./testcaferc.json "tests/acceptance")
acceptance-auth-short: acceptance-auth-short:
$(info Running JS acceptance-auth tests in Chrome…) $(info Running JS acceptance-auth tests in Chrome...)
(cd frontend && npm run testcafe -- chrome:headless --test-grep "^(Common|Core)\:*" --test-meta mode=auth,type=short --config-file ./testcaferc.json "tests/acceptance") (cd frontend && npm run testcafe -- chrome:headless --test-grep "^(Common|Core)\:*" --test-meta mode=auth,type=short --config-file ./testcaferc.json "tests/acceptance")
acceptance-auth-firefox: acceptance-auth-firefox:
$(info Running JS acceptance-auth tests in Firefox…) $(info Running JS acceptance-auth tests in Firefox...)
(cd frontend && npm run testcafe -- firefox:headless --test-grep "^(Common|Core)\:*" --test-meta mode=auth --config-file ./testcaferc.json "tests/acceptance") (cd frontend && npm run testcafe -- firefox:headless --test-grep "^(Common|Core)\:*" --test-meta mode=auth --config-file ./testcaferc.json "tests/acceptance")
reset-mariadb: reset-mariadb:
$(info Resetting photoprism database…) $(info Resetting photoprism database...)
mysql < scripts/sql/reset-photoprism.sql mysql < scripts/sql/reset-photoprism.sql
reset-mariadb-testdb: reset-mariadb-testdb:
$(info Resetting testdb database…) $(info Resetting testdb database...)
mysql < scripts/sql/reset-testdb.sql mysql < scripts/sql/reset-testdb.sql
reset-mariadb-local: reset-mariadb-local:
$(info Resetting local database…) $(info Resetting local database...)
mysql < scripts/sql/reset-local.sql mysql < scripts/sql/reset-local.sql
reset-mariadb-acceptance: reset-mariadb-acceptance:
$(info Resetting acceptance database…) $(info Resetting acceptance database...)
mysql < scripts/sql/reset-acceptance.sql mysql < scripts/sql/reset-acceptance.sql
reset-mariadb-all: reset-mariadb-testdb reset-mariadb-local reset-mariadb-acceptance reset-mariadb-photoprism reset-mariadb-all: reset-mariadb-testdb reset-mariadb-local reset-mariadb-acceptance reset-mariadb-photoprism
reset-testdb: reset-sqlite reset-mariadb-testdb reset-testdb: reset-sqlite reset-mariadb-testdb
reset-acceptance: reset-mariadb-acceptance reset-acceptance: reset-mariadb-acceptance
reset-sqlite: reset-sqlite:
$(info Removing test database files…) $(info Removing test database files...)
find ./internal -type f -name ".test.*" -delete find ./internal -type f -name ".test.*" -delete
run-test-short: run-test-short:
$(info Running short Go tests in parallel mode…) $(info Running short Go tests in parallel mode...)
$(GOTEST) -parallel 2 -count 1 -cpu 2 -short -timeout 5m ./pkg/... ./internal/... $(GOTEST) -parallel 2 -count 1 -cpu 2 -short -timeout 5m ./pkg/... ./internal/...
run-test-go: run-test-go:
$(info Running all Go tests...) $(info Running all Go tests...)

2
scripts/build.sh
View file

@ -17,7 +17,7 @@ BUILD_BIN=${2:-photoprism}
GO_BIN=${GO_BIN:-go} GO_BIN=${GO_BIN:-go}
GO_VER=$($GO_BIN version) GO_VER=$($GO_BIN version)
echo "Building PhotoPrism ${BUILD_ID} ($1)…" echo "Building PhotoPrism ${BUILD_ID} ($1)..."
if [[ $1 == "debug" ]]; then if [[ $1 == "debug" ]]; then
BUILD_CMD=("$GO_BIN" build -tags=debug -ldflags "-X main.version=${BUILD_ID}-DEBUG" -o "${BUILD_BIN}" cmd/photoprism/photoprism.go) BUILD_CMD=("$GO_BIN" build -tags=debug -ldflags "-X main.version=${BUILD_ID}-DEBUG" -o "${BUILD_BIN}" cmd/photoprism/photoprism.go)

4
scripts/download-facenet.sh
View file

@ -10,7 +10,7 @@ MODEL_HASH="0492eb1d67789108b7eefb274e26633504b059be $MODEL_ZIP"
MODEL_VERSION="$MODEL_PATH/version.txt" MODEL_VERSION="$MODEL_PATH/version.txt"
MODEL_BACKUP="storage/backup/facenet-$TODAY" MODEL_BACKUP="storage/backup/facenet-$TODAY"
echo "Installing $MODEL_NAME model for TensorFlow…" echo "Installing $MODEL_NAME model for TensorFlow..."
# Create directories # Create directories
mkdir -p /tmp/photoprism mkdir -p /tmp/photoprism
@ -24,7 +24,7 @@ if [[ -f ${MODEL_ZIP} ]] && [[ $(sha1sum ${MODEL_ZIP}) == ${MODEL_HASH} ]]; then
fi fi
else else
# Download model # Download model
echo "Downloading latest model from $MODEL_URL…" echo "Downloading latest model from $MODEL_URL..."
wget --inet4-only -c "${MODEL_URL}" -O ${MODEL_ZIP} wget --inet4-only -c "${MODEL_URL}" -O ${MODEL_ZIP}
TMP_HASH=$(sha1sum ${MODEL_ZIP}) TMP_HASH=$(sha1sum ${MODEL_ZIP})

4
scripts/download-nasnet.sh
View file

@ -10,7 +10,7 @@ MODEL_HASH="f18b801354e95cade497b4f12e8d2537d04c04f6 $MODEL_ZIP"
MODEL_VERSION="$MODEL_PATH/version.txt" MODEL_VERSION="$MODEL_PATH/version.txt"
MODEL_BACKUP="storage/backup/nasnet-$TODAY" MODEL_BACKUP="storage/backup/nasnet-$TODAY"
echo "Installing $MODEL_NAME model for TensorFlow…" echo "Installing $MODEL_NAME model for TensorFlow..."
# Create directories # Create directories
mkdir -p /tmp/photoprism mkdir -p /tmp/photoprism
@ -24,7 +24,7 @@ if [[ -f ${MODEL_ZIP} ]] && [[ $(sha1sum ${MODEL_ZIP}) == "${MODEL_HASH}" ]]; th
fi fi
else else
# Download model # Download model
echo "Downloading latest model from $MODEL_URL…" echo "Downloading latest model from $MODEL_URL..."
wget --inet4-only -c "${MODEL_URL}" -O ${MODEL_ZIP} wget --inet4-only -c "${MODEL_URL}" -O ${MODEL_ZIP}
TMP_HASH=$(sha1sum ${MODEL_ZIP}) TMP_HASH=$(sha1sum ${MODEL_ZIP})

4
scripts/download-nsfw.sh
View file

@ -10,7 +10,7 @@ MODEL_HASH="2e03ad3c6aec27c270c650d0574ff2a6291d992b $MODEL_ZIP"
MODEL_VERSION="$MODEL_PATH/version.txt" MODEL_VERSION="$MODEL_PATH/version.txt"
MODEL_BACKUP="storage/backup/nsfw-$TODAY" MODEL_BACKUP="storage/backup/nsfw-$TODAY"
echo "Installing $MODEL_NAME model for TensorFlow…" echo "Installing $MODEL_NAME model for TensorFlow..."
# Create directories # Create directories
mkdir -p /tmp/photoprism mkdir -p /tmp/photoprism
@ -24,7 +24,7 @@ if [[ -f ${MODEL_ZIP} ]] && [[ $(sha1sum ${MODEL_ZIP}) == "${MODEL_HASH}" ]]; th
fi fi
else else
# Download model # Download model
echo "Downloading latest model from $MODEL_URL…" echo "Downloading latest model from $MODEL_URL..."
wget --inet4-only -c "${MODEL_URL}" -O ${MODEL_ZIP} wget --inet4-only -c "${MODEL_URL}" -O ${MODEL_ZIP}
TMP_HASH=$(sha1sum ${MODEL_ZIP}) TMP_HASH=$(sha1sum ${MODEL_ZIP})

4
scripts/gettext-clear-fuzzy.sh
View file

@ -1,9 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
echo "Removing fuzzy attribute from backend translations…" echo "Removing fuzzy attribute from backend translations..."
for file in ./assets/locales/**/*.po; do msgattrib --clear-fuzzy -o "${file}" "${file}"; done for file in ./assets/locales/**/*.po; do msgattrib --clear-fuzzy -o "${file}" "${file}"; done
echo "Removing fuzzy attribute from frontend translations…" echo "Removing fuzzy attribute from frontend translations..."
for file in ./frontend/src/locales/*.po; do msgattrib --clear-fuzzy -o "${file}" "${file}"; done for file in ./frontend/src/locales/*.po; do msgattrib --clear-fuzzy -o "${file}" "${file}"; done
echo "Done." echo "Done."

4
scripts/gettext-merge.sh
View file

@ -1,9 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
echo "Merging backend translations…" echo "Merging backend translations..."
for file in ./assets/locales/**/*.po; do msgmerge --previous --no-fuzzy-matching --update "${file}" ./assets/locales/messages.pot; done for file in ./assets/locales/**/*.po; do msgmerge --previous --no-fuzzy-matching --update "${file}" ./assets/locales/messages.pot; done
echo "Merging frontend translations…" echo "Merging frontend translations..."
for file in ./frontend/src/locales/*.po; do msgmerge --previous --no-fuzzy-matching --no-wrap --update "${file}" ./frontend/src/locales/translations.pot; done for file in ./frontend/src/locales/*.po; do msgmerge --previous --no-fuzzy-matching --no-wrap --update "${file}" ./frontend/src/locales/translations.pot; done
echo "Done." echo "Done."