Skip to content

Commit

Permalink
use script to capture rpm build log
Browse files Browse the repository at this point in the history
  • Loading branch information
zenmonkeykstop committed Jan 21, 2025
1 parent 0ad7ef6 commit fb0d159
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ config.json
*.swp
builder/build/*
sd-journalist.sec
build-log/

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down Expand Up @@ -119,4 +120,4 @@ rpm-build/BUILD/
rpm-build/BUILDROOT/

# IDEs
.vscode
.vscode
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,16 @@ dev staging: assert-dom0 ## Configures and builds a dev or staging environment
sdw-admin --apply

.PHONY: build-rpm
build-rpm: OUT:=build-log/securedrop-workstation-$(shell date +%Y%m%d).log
build-rpm: ## Build RPM package
USE_BUILD_CONTAINER=true $(CONTAINER) ./scripts/build-rpm.sh
@mkdir -p build-log
@echo "Building SecureDop Workstation RPM..."
@export TERM=dumb
@USE_BUILD_CONTAINER=true script \
--command "$(CONTAINER) ./scripts/build-rpm.sh" \
--return $(OUT)
@echo
@echo "Build log available at $(OUT)"

# FIXME: the time variations have been temporarily removed from reprotest
# Suspecting upstream issues in rpm land is causing issues with 1 file\'s modification time not being clamped correctly only in a reprotest environment
Expand Down

0 comments on commit fb0d159

Please sign in to comment.