Merge pull request #527 from rstudio/kegs-build-running-state

Make it more unlikely for content builds to get stuck in a running state

Author: dbkegley

CHANGELOG.md

@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added the name of the environment variables to the help output for those options that
   use environment variables as a default value.
 - Added support for deploying Shiny Express applications.
+- Added a `--retry` flag to the `rsconnect content build run` command to re-run
+  builds for all content in the NEEDS_BUILD, ABORTED, ERROR, or RUNNING state.
 
 ### Changed
 - Improved the error and warning outputs when options conflict by providing the source
@@ -19,6 +21,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated verbose mode to output the source of all options being used when processing the
   CLI command.
 
+### Fixed
+- Interrupting a long-running `rsconnect content build run` command with `^C`
+  will now update the local state file before attempting graceful cleanup. This
+  should help prevent users from getting stuck a "build already running" state.
+  See [#467](https://github.com/rstudio/rsconnect-python/issues/467) for details.
+
 ## [1.21.0] - 2023-10-26
 
 ### Fixed

Makefile

@@ -19,16 +19,14 @@ ifneq ($(GITHUB_RUN_ID),)
 endif
 
 TEST_ENV =
+TEST_ENV += CONNECT_CONTENT_BUILD_DIR="rsconnect-build-test"
 
 ifneq ($(CONNECT_SERVER),)
   TEST_ENV += CONNECT_SERVER=$(CONNECT_SERVER)
 endif
 ifneq ($(CONNECT_API_KEY),)
   TEST_ENV += CONNECT_API_KEY=$(CONNECT_API_KEY)
 endif
-ifneq ($(CONNECT_CONTENT_BUILD_DIR),)
-	TEST_ENV += CONNECT_CONTENT_BUILD_DIR=$(CONNECT_CONTENT_BUILD_DIR)
-endif
 
 # NOTE: See the `dist` target for why this exists.
 SOURCE_DATE_EPOCH := $(shell date +%s)
@@ -49,16 +47,6 @@ shell-%:
 test-%:
 	PYTHON_VERSION=$* $(RUNNER) '$(TEST_ENV) $(TEST_COMMAND)'
 
-mock-test-%: clean-stores
-	@$(MAKE) -C mock_connect image up
-	@sleep 1
-	trap "$(MAKE) -C mock_connect down" EXIT; \
-	CONNECT_CONTENT_BUILD_DIR="rsconnect-build-test" \
-	CONNECT_SERVER="http://$(HOSTNAME):3939" \
-	CONNECT_API_KEY="0123456789abcdef0123456789abcdef" \
-	$(MAKE) test-$*
-	@$(MAKE) -C mock_connect down
-
 fmt-%:
 	$(RUNNER) 'black .'
 

README.md

@@ -823,6 +823,9 @@ Once the content items have been added, you may initiate a build
 using the `rsconnect content build run` subcommand. This command will attempt to
 build all "tracked" content that has the status `NEEDS_BUILD`.
 
+> To re-run failed builds, use `rsconnect content build run --retry`. This will build
+all tracked content in any of the following states: `[NEEDS_BUILD, ABORTED, ERROR, RUNNING]`.
+
 ```bash
 rsconnect content build run
 # [INFO] 2021-12-14T13:02:45-0500 Initializing ContentBuildStore for https://connect.example.org:3939