Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Release] Synchronize for release #70

Merged
merged 1 commit into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tests/serve_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ if command -v docker &> /dev/null; then
done

# Check the output.
if ! diff -u "$EXPECTED_CURL_OUTPUT_FILE" "$actual_output_file"; then
if ! diff -u "${SANDBOX_ROOT}$EXPECTED_CURL_OUTPUT_FILE" "$actual_output_file"; then
echo "The actual output does not match the expected output."
exit 1
fi
Expand Down
37 changes: 2 additions & 35 deletions .tests/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@
set -e # Exit if a command exits with an error.
set -x # Echo executed commands to help debug failures.

# Check that this script has been invoked with the right working directory, by
# checking that the expected subdirectories exist.
ls -l api/ backend/src/ web/ 2> /dev/null > /dev/null || {
echo "ERROR: this script must be invoked from the root of the 'reboot-hello' repository."
echo "Current working directory is '$(pwd)'."
exit 1
}

# MacOS tests can fail due to a race in `protoc` writing files to disk,
# so now we check only occurences of the expected lines in the output.
# See https://github.com/reboot-dev/mono/issues/3433
Expand All @@ -26,35 +18,14 @@ check_lines_in_file() {
done < "$expected"
}

# Convert symlinks to files that we need to mutate into copies.
for file in "requirements.lock" "requirements-dev.lock" "pyproject.toml"; do
cp "$file" "${file}.tmp"
rm "$file"
mv "${file}.tmp" "$file"
done

# Use the published Reboot pip package by default, but allow the test system
# to override them with a different value.
if [ -n "$REBOOT_WHL_FILE" ]; then
# Install the `reboot` package from the specified path explicitly, over-
# writing the version from `pyproject.toml`.
rye remove --no-sync reboot
rye remove --no-sync --dev reboot
rye add --dev reboot --absolute --path=$REBOOT_WHL_FILE
fi

# Use the published Reboot npm package by default, but allow the test system
# to override them with a different value.
if [ -n "$REBOOT_NPM_PACKAGE" ]; then
export REBOOT_NPM_PACKAGE=$(realpath "$REBOOT_NPM_PACKAGE")
fi

if [ -n "$REBOOT_API_NPM_PACKAGE" ]; then
export REBOOT_API_NPM_PACKAGE=$(realpath "$REBOOT_API_NPM_PACKAGE")
fi

if [ -n "$REBOOT_REACT_NPM_PACKAGE" ]; then
export REBOOT_REACT_NPM_PACKAGE=$(realpath "$REBOOT_REACT_NPM_PACKAGE")
rye add --dev reboot --absolute --path="${SANDBOX_ROOT}$REBOOT_WHL_FILE"
fi

# Create and activate a virtual environment.
Expand All @@ -77,11 +48,7 @@ if [ -n "$EXPECTED_RBT_DEV_OUTPUT_FILE" ]; then

rbt $RBT_FLAGS dev run --terminate-after-health-check > "$actual_output_file"

check_lines_in_file "$EXPECTED_RBT_DEV_OUTPUT_FILE" "$actual_output_file"
check_lines_in_file "${SANDBOX_ROOT}$EXPECTED_RBT_DEV_OUTPUT_FILE" "$actual_output_file"

rm "$actual_output_file"
fi

# Deactivate the virtual environment, since we can run a test which may require
# another virtual environment (currently we do that only in `all_tests.sh`).
deactivate
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/reboot-dev/reboot-base:0.19.2
FROM ghcr.io/reboot-dev/reboot-base:0.20.0

WORKDIR /app

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[project]
requires-python = ">= 3.10"
dependencies = [
"reboot==0.19.2",
"reboot==0.20.0",
]

[tool.rye]
dev-dependencies = [
"mypy==1.2.0",
"pytest>=7.4.2",
"types-protobuf>=4.24.0.20240129",
"reboot==0.19.2",
"reboot==0.20.0",
]

# This project only uses `rye` to provide `python` and its dependencies, so
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.lock
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ python-dateutil==2.9.0.post0
pyyaml==6.0.2
# via kubernetes-asyncio
# via reboot
reboot==0.19.2
reboot==0.20.0
setuptools==75.1.0
# via grpcio-tools
six==1.16.0
Expand Down
2 changes: 1 addition & 1 deletion requirements.lock
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ python-dateutil==2.9.0.post0
pyyaml==6.0.2
# via kubernetes-asyncio
# via reboot
reboot==0.19.2
reboot==0.20.0
setuptools==75.1.0
# via grpcio-tools
six==1.16.0
Expand Down
30 changes: 15 additions & 15 deletions web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@reboot-dev/reboot-react": "^0.19.2",
"@reboot-dev/reboot-react": "^0.20.0",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
Expand Down
Loading