Merge pull request #443 from shuttle-hq/development

chore: v0.7.2

.gitignore

@@ -29,3 +29,10 @@ e2e/users.toml
 
 .shuttle-*
 docker-compose.rendered.yml
+
+.env
+node_modules/
+package.json
+yarn.lock
+
+*.wasm

Makefile

@@ -54,7 +54,7 @@ RUST_LOG?=debug
 
 DOCKER_COMPOSE_ENV=STACK=$(STACK) BACKEND_TAG=$(TAG) PROVISIONER_TAG=$(TAG) POSTGRES_TAG=${POSTGRES_TAG} APPS_FQDN=$(APPS_FQDN) DB_FQDN=$(DB_FQDN) POSTGRES_PASSWORD=$(POSTGRES_PASSWORD) RUST_LOG=$(RUST_LOG) CONTAINER_REGISTRY=$(CONTAINER_REGISTRY) MONGO_INITDB_ROOT_USERNAME=$(MONGO_INITDB_ROOT_USERNAME) MONGO_INITDB_ROOT_PASSWORD=$(MONGO_INITDB_ROOT_PASSWORD)
 
-.PHONY: images clean src up down deploy shuttle-% postgres docker-compose.rendered.yml test
+.PHONY: images clean src up down deploy shuttle-% postgres docker-compose.rendered.yml test bump-% deploy-examples publish publish-% --validate-version
 
 clean:
 	rm .shuttle-*
@@ -94,3 +94,113 @@ shuttle-%: ${SRC} Cargo.lock
 	       $(BUILDX_FLAGS) \
 	       -f Containerfile \
 	       .
+
+# Bunch of targets to make bumping the shuttle version easier
+#
+# Dependencies: git, cargo-edit, fastmod, ripgrep
+# Usage: make bump-version current=0.6.3 version=0.7.0
+bump-version: --validate-version
+	git checkout development
+	git fetch --all
+	git pull upstream
+	git checkout -b "chore/v$(version)"
+	cargo set-version --workspace "$(version)"
+
+	$(call next, bump-resources)
+
+bump-resources:
+	git commit -m "chore: v$(version)"
+	fastmod --fixed-strings $(current) $(version) resources
+
+	$(call next, bump-examples)
+
+bump-examples:
+	git commit -m "chore: resources v$(version)"
+	fastmod --fixed-strings $(current) $(version) examples
+
+	$(call next, bump-misc)
+
+bump-misc:
+	git commit -m "docs: v$(version)"
+	fastmod --fixed-strings $(current) $(version)
+
+	$(call next, bump-final)
+
+bump-final:
+	git commit -m "misc: v$(version)"
+	git push --set-upstream origin $$(git rev-parse --abbrev-ref HEAD)
+
+	echo "Make pull request and confirm everything is okay. Then run:"
+	echo "make publish"
+
+# Deploy all our example using the command set in shuttle-command
+# Usage: make deploy-example shuttle-command="cargo shuttle" -j 2
+deploy-examples: deploy-examples/rocket/hello-world \
+	deploy-examples/rocket/persist \
+	deploy-examples/rocket/postgres \
+	deploy-examples/rocket/secrets \
+	deploy-examples/rocket/authentication \
+	deploy-examples/axum/hello-world \
+	deploy-examples/axum/websocket \
+	deploy-examples/poem/hello-world \
+	deploy-examples/poem/mongodb \
+	deploy-examples/poem/postgres \
+	deploy-examples/salvo/hello-world \
+	deploy-examples/tide/hello-world \
+	deploy-examples/tide/postgres \
+	deploy-examples/tower/hello-world \
+	deploy-examples/warp/hello-world \
+
+	echo "All example have been redeployed"
+
+deploy-examples/%:
+	cd examples/$(*); $(shuttle-command) project rm || echo -e "\x1B[33m>> Nothing to remove for $*\x1B[39m"
+	sleep 5
+	cd examples/$(*); $(shuttle-command) project new
+	sleep 5
+	cd examples/$(*); $(shuttle-command) deploy
+
+define next
+	cargo check # To update Cargo.lock
+	git add --all
+	git --no-pager diff --staged
+
+	echo -e "\x1B[36m>> Is this correct?\x1B[39m"
+	read yn; if [ $$yn != "y" ]; then echo "Fix the issues then continue with:"; echo "make version=$(version) current=$(current) $1"; exit 2; fi
+
+	make $1
+endef
+
+# Publish all our crates to crates.io
+# See CONTRIBUTING.md for the dependency graph
+# Usage: make publish -j 4
+publish: publish-resources publish-cargo-shuttle
+	echo "The branch can now be safely merged"
+
+publish-resources: publish-resources/aws-rds \
+	publish-resources/persist \
+	publish-resources/shared-db
+
+publish-cargo-shuttle: publish-resources/secrets
+	cd cargo-shuttle; cargo publish
+	sleep 10 # Wait for crates.io to update
+
+publish-service: publish-codegen publish-common
+	cd service; cargo publish
+	sleep 10 # Wait for crates.io to update
+
+publish-codegen:
+	cd codegen; cargo publish
+	sleep 10 # Wait for crates.io to update
+
+publish-common:
+	cd common; cargo publish
+	sleep 10 # Wait for crates.io to update
+
+publish-resources/%: publish-service
+	cd resources/$(*); cargo publish
+	sleep 10 # Wait for crates.io to update
+
+--validate-version:
+	echo "$(version)" | rg -q "\d+\.\d+\.\d+" || { echo "version argument must be in the form x.y.z"; exit 1; }
+	echo "$(current)" | rg -q "\d+\.\d+\.\d+" || { echo "current argument must be in the form x.y.z"; exit 1; }

cargo-shuttle/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-shuttle"
-version = "0.7.1"
+version = "0.7.2"
 edition = "2021"
 license = "Apache-2.0"
 description = "A cargo command for the shuttle platform (https://www.shuttle.rs/)"
@@ -43,15 +43,15 @@ uuid = { version = "1.1.2", features = ["v4"] }
 webbrowser = "0.7.1"
 
 [dependencies.shuttle-common]
-version = "0.7.1"
+version = "0.7.2"
 path = "../common"
 
 [dependencies.shuttle-secrets]
-version = "0.7.1"
+version = "0.7.2"
 path = "../resources/secrets"
 
 [dependencies.shuttle-service]
-version = "0.7.1"
+version = "0.7.2"
 path = "../service"
 features = ["loader"]
 

cargo-shuttle/README.md

@@ -90,7 +90,7 @@ $ cargo shuttle init --rocket my-rocket-app
 
 This should generate the following dependency in `Cargo.toml`:
 ```toml
-shuttle-service = { version = "0.7.1", features = ["web-rocket"] }
+shuttle-service = { version = "0.7.2", features = ["web-rocket"] }
 ```
 
 The following boilerplate code should be generated into `src/lib.rs`:

codegen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shuttle-codegen"
-version = "0.7.1"
+version = "0.7.2"
 edition = "2021"
 license = "Apache-2.0"
 description = "Proc-macro code generator for the shuttle.rs service"