Skip to content

Commit

Permalink
Move scripts to development dir
Browse files Browse the repository at this point in the history
  • Loading branch information
angelini committed Jul 8, 2022
1 parent ee2ff4b commit eb71b7a
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ VOLUME /home/main/secrets/paseto

COPY release/server_linux_amd64 server
COPY migrations migrations
COPY scripts/entrypoint.sh entrypoint.sh
COPY entrypoint.sh entrypoint.sh

ENTRYPOINT ["./entrypoint.sh"]
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -126,21 +126,21 @@ server-profile:
client-update: export DL_TOKEN=$(DEV_TOKEN_ADMIN)
client-update: export DL_SKIP_SSL_VERIFICATION=1
client-update:
scripts/simple_input.sh 1
development/scripts/simple_input.sh 1
go run cmd/client/main.go update --project 1 --server $(GRPC_SERVER) --dir input/simple
scripts/simple_input.sh 2
development/scripts/simple_input.sh 2
go run cmd/client/main.go update --project 1 --server $(GRPC_SERVER) --dir input/simple
scripts/simple_input.sh 3
development/scripts/simple_input.sh 3
go run cmd/client/main.go update --project 1 --server $(GRPC_SERVER) --dir input/simple

client-large-update: export DL_TOKEN=$(DEV_TOKEN_ADMIN)
client-large-update: export DL_SKIP_SSL_VERIFICATION=1
client-large-update:
scripts/complex_input.sh 1
development/scripts/complex_input.sh 1
go run cmd/client/main.go update --project 1 --server $(GRPC_SERVER) --dir input/complex
scripts/complex_input.sh 2
development/scripts/complex_input.sh 2
go run cmd/client/main.go update --project 1 --server $(GRPC_SERVER) --dir input/complex
scripts/complex_input.sh 3
development/scripts/complex_input.sh 3
go run cmd/client/main.go update --project 1 --server $(GRPC_SERVER) --dir input/complex

client-get: export DL_TOKEN=$(DEV_TOKEN_ADMIN)
Expand Down Expand Up @@ -187,7 +187,7 @@ define load-test
ghz --cert=development/server.crt --key=development/server.key \
--proto internal/pb/fs.proto --call "pb.Fs.$(1)" \
--total $(3) --concurrency $(4) --rps $(if $5,$5,0) \
--data-file "scripts/load-tests/$(2)" \
--data-file "development/scripts/load-tests/$(2)" \
--metadata '{"authorization": "Bearer $(DEV_TOKEN_ADMIN)"}' \
localhost:$(GRPC_PORT)
endef
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ realpath() {
echo "$(cd ${path}; pwd -P)"
}

readonly ROOT_DIR="$(realpath "$(dirname "$0")/..")"
readonly ROOT_DIR="$(realpath "$(dirname "$0")/../..")"
readonly INPUT_DIR="${ROOT_DIR}/input/complex"

build_node_modules() {
Expand All @@ -32,19 +32,19 @@ v1() {
local dir="${1}"
rm -rf "${dir:?}"
mkdir -p "${dir}"
build_node_modules "${ROOT_DIR}/scripts/package-v1.json" "${dir}"
build_node_modules "${ROOT_DIR}/development/scripts/package-v1.json" "${dir}"
log "wrote v1 to ${dir}"
}

v2() {
local dir="${1}"
build_node_modules "${ROOT_DIR}/scripts/package-v2.json" "${dir}"
build_node_modules "${ROOT_DIR}/development/scripts/package-v2.json" "${dir}"
log "wrote v2 to ${dir}"
}

v3() {
local dir="${1}"
build_node_modules "${ROOT_DIR}/scripts/package-v3.json" "${dir}"
build_node_modules "${ROOT_DIR}/development/scripts/package-v3.json" "${dir}"
log "wrote v3 to ${dir}"
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ realpath() {
echo "$(cd ${path}; pwd -P)"
}

readonly ROOT_DIR="$(realpath "$(dirname "$0")/..")"
readonly ROOT_DIR="$(realpath "$(dirname "$0")/../..")"
readonly INPUT_DIR="${ROOT_DIR}/input/simple"

v1() {
Expand Down
File renamed without changes.

0 comments on commit eb71b7a

Please sign in to comment.