Trusted Build changes (#4001)

* remove apt install directives * remove more apt references * cargo fetch test * disable building converter-ms-sems by default * disable converter-sems build directive * rust dependency changes * we no longer use the services structure with the removal of converter-ms-sems * fix path so cargo is available * working on localdev bootstrap * update path to ballot-interpreter after directory rename * update circleci config for trusted build changes to rust/cargo * ordering * remove newline * fix rust-addon type in build step
votingworks · Oct 2, 2023 · b0de844 · b0de844
1 parent 098c967
commit b0de844
Show file tree

Hide file tree

Showing 21 changed files with 28 additions and 60 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1234,6 +1234,8 @@ commands:
           name: Setup Dependencies
           command: |
             pnpm install --frozen-lockfile
+            pnpm --dir libs/ballot-interpreter install:rust-addon
+            pnpm --dir libs/ballot-interpreter build:rust-addon
       - save_cache:
           key:
             dotcache-cache-{{checksum ".circleci/config.yml" }}-{{ checksum

diff --git a/apps/admin/backend/Makefile b/apps/admin/backend/Makefile
@@ -4,8 +4,6 @@ NODE_ENV ?= development
 FORCE:
 
 install:
-	sudo apt -y update
-	sudo apt -y install libpcsclite1 libpcsclite-dev
 
 build: FORCE
 	pnpm install && pnpm build

diff --git a/apps/admin/frontend/Makefile b/apps/admin/frontend/Makefile
@@ -2,9 +2,7 @@
 # a phony dependency that can be used as a dependency to force builds
 FORCE:
 
-# install any required dependencies here, i.e. `sudo apt install -y DEPS`
 install:
-	sudo apt install -y fdisk dosfstools exfat-utils
 
 build: FORCE
 	pnpm install && pnpm build

diff --git a/apps/admin/frontend/package.json b/apps/admin/frontend/package.json
@@ -174,7 +174,6 @@
   "vx": {
     "isBundled": true,
     "services": [
-      "../../../services/converter-ms-sems",
       "../backend"
     ]
   }

diff --git a/apps/central-scan/backend/Makefile b/apps/central-scan/backend/Makefile
@@ -6,16 +6,6 @@ TIMESTAMP := $(shell date --iso-8601=seconds --utc | sed 's/+.*$\//g' | tr ':' '
 FORCE:
 
 install:
-	sudo apt-get -y update
-ifeq ($(OS),bionic)
-	sudo apt-get install -y libsane build-essential libx11-dev libjpeg-dev libpng-dev libpcsclite1 libpcsclite-dev
-endif
-ifeq ($(OS),focal)
-	sudo apt install -y libsane build-essential libpixman-1-dev libcairo2-dev libpango1.0-dev libjpeg8-dev libgif-dev libpcsclite1 libpcsclite-dev
-endif
-ifeq ($(OS),bullseye)
-	sudo apt install -y libsane libpng-dev libjpeg-dev libx11-dev libpixman-1-dev libcairo2-dev libpango1.0-dev libgif-dev libpcsclite1 libpcsclite-dev
-endif
 
 build: FORCE
 	pnpm install && pnpm build

diff --git a/apps/central-scan/frontend/Makefile b/apps/central-scan/frontend/Makefile
@@ -2,11 +2,10 @@
 # a phony dependency that can be used as a dependency to force builds
 FORCE:
 
-# install any required dependencies here, i.e. `sudo apt install -y DEPS`
 install:
 
 build: FORCE
-	pnpm install && pnpm build
+	pnpm install && pnpm --dir ../../../libs/ballot-interpreter build && pnpm build	
 
 bootstrap: install build
 

diff --git a/apps/design/backend/Makefile b/apps/design/backend/Makefile
@@ -0,0 +1,7 @@
+# Placeholder for build
+
+install:
+
+build:
+
+bootstrap:
diff --git a/apps/design/frontend/Makefile b/apps/design/frontend/Makefile
@@ -2,7 +2,6 @@
 # a phony dependency that can be used as a dependency to force builds
 FORCE:
 
-# install any required dependencies here, i.e. `sudo apt install -y DEPS`
 install:
 
 build: FORCE

diff --git a/apps/mark-scan/backend/Makefile b/apps/mark-scan/backend/Makefile
@@ -7,8 +7,6 @@ build: FORCE
 bootstrap: build
 
 install:
-	sudo apt -y update
-	sudo apt -y install libpcsclite1 libpcsclite-dev
 
 run:
 	pnpm start
diff --git a/apps/mark-scan/frontend/Makefile b/apps/mark-scan/frontend/Makefile
@@ -3,7 +3,6 @@ BACKEND := ../backend
 # a phony dependency that can be used as a dependency to force builds
 FORCE:
 
-# install any required dependencies here, i.e. `sudo apt install -y DEPS`
 install:
 
 build-backend:
@@ -18,7 +17,7 @@ run-all:
 	(trap 'kill 0' SIGINT SIGHUP; make -C $(BACKEND) run & cd prodserver && node index.js)
 
 build: FORCE
-	pnpm install && pnpm build
+	pnpm install && pnpm --dir ../../../libs/ballot-interpreter build && pnpm build
 
 bootstrap: install build
 

diff --git a/apps/mark/backend/Makefile b/apps/mark/backend/Makefile
@@ -7,8 +7,6 @@ build: FORCE
 bootstrap: build
 
 install:
-	sudo apt -y update
-	sudo apt -y install libpcsclite1 libpcsclite-dev
 
 run:
 	pnpm start
diff --git a/apps/mark/frontend/Makefile b/apps/mark/frontend/Makefile
@@ -3,7 +3,6 @@ BACKEND := ../backend
 # a phony dependency that can be used as a dependency to force builds
 FORCE:
 
-# install any required dependencies here, i.e. `sudo apt install -y DEPS`
 install:
 
 build-backend:

diff --git a/apps/scan/backend/Makefile b/apps/scan/backend/Makefile
@@ -6,16 +6,6 @@ TIMESTAMP := $(shell date --iso-8601=seconds --utc | sed 's/+.*$\//g' | tr ':' '
 FORCE:
 
 install:
-	sudo apt-get -y update
-ifeq ($(OS),bionic)
-	sudo apt-get install -y libsane build-essential libx11-dev libjpeg-dev libpng-dev libpcsclite1 libpcsclite-dev
-endif
-ifeq ($(OS),focal)
-	sudo apt install -y libsane build-essential libpixman-1-dev libcairo2-dev libpango1.0-dev libjpeg8-dev libgif-dev libpcsclite1 libpcsclite-dev
-endif
-ifeq ($(OS),bullseye)
-	sudo apt install -y libsane libpng-dev libjpeg-dev libx11-dev libpixman-1-dev libcairo2-dev libpango1.0-dev libgif-dev libpcsclite1 libpcsclite-dev
-endif
 
 build: FORCE
 	pnpm install && pnpm build

diff --git a/apps/scan/frontend/Makefile b/apps/scan/frontend/Makefile
@@ -2,11 +2,10 @@
 # a phony dependency that can be used as a dependency to force builds
 FORCE:
 
-# install any required dependencies here, i.e. `sudo apt install -y DEPS`
 install:
 
 build: FORCE
-	pnpm install && pnpm build
+	pnpm install && pnpm --dir ../../../libs/ballot-interpreter build && pnpm build
 
 bootstrap: install build
 

diff --git a/libs/auth/Makefile b/libs/auth/Makefile
@@ -1,5 +1,4 @@
 install-script-dependencies:
-	sudo apt install -y default-jdk wget
 	wget 'https://github.com/martinpaljak/GlobalPlatformPro/releases/download/v20.08.12/gp.jar'
 	@echo 'Checking hash of downloaded gp.jar'
 	@sha256sum gp.jar | diff scripts/gp.jar.sha256sum - || (echo '❌ Hash check of downloaded gp.jar failed' && rm gp.jar && exit 1)

diff --git a/libs/ballot-interpreter/README.md b/libs/ballot-interpreter/README.md
@@ -9,12 +9,6 @@ This library requires a
 [supported version of Node and Rust](https://github.com/neon-bindings/neon#platform-support).
 The easiest way to install Rust is via [rustup](https://rustup.rs/).
 
-Then run:
-
-```sh
-$ pnpm install
-```
-
 ## Build
 
 This will build both the Rust library and the Node package.

diff --git a/libs/ballot-interpreter/package.json b/libs/ballot-interpreter/package.json
@@ -12,11 +12,11 @@
   ],
   "scripts": {
     "benchmark": "jest --runInBand --projects benchmarks",
-    "build": "pnpm build:rust-addon && pnpm build:ts",
-    "build:rust-addon": "cargo-cp-artifact -nc build/hmpb-ts/rust_addon.node -- cargo build --message-format=json-render-diagnostics --release",
+    "build": "pnpm install:rust-addon && pnpm build:rust-addon && pnpm build:ts",
+    "build:rust-addon": "cargo-cp-artifact -nc build/hmpb-ts/rust_addon.node -- cargo build --message-format=json-render-diagnostics --release --offline",
     "build:ts": "tsc --build tsconfig.build.json",
     "clean": "cargo clean && rm -rf build tsconfig.tsbuildinfo tsconfig.build.tsbuildinfo",
-    "install": "pnpm build:rust-addon",
+    "install:rust-addon": "cargo fetch",
     "lint": "pnpm type-check && eslint .",
     "lint:fix": "pnpm type-check && eslint . --fix",
     "pre-commit": "lint-staged",

diff --git a/libs/monorepo-utils/src/circleci.ts b/libs/monorepo-utils/src/circleci.ts
@@ -179,6 +179,8 @@ commands:
           name: Setup Dependencies
           command: |
             pnpm install --frozen-lockfile
+            pnpm --dir libs/ballot-interpreter install:rust-addon
+            pnpm --dir libs/ballot-interpreter build:rust-addon
       - save_cache:
           key:
             dotcache-cache-{{checksum ".circleci/config.yml" }}-{{ checksum

diff --git a/script/bootstrap b/script/bootstrap
@@ -2,12 +2,15 @@
 
 set -euo pipefail
 
-# pixman-1 is effectively a dependency in all pnpm calls, go ahead and install it 
-sudo apt install -y libsane libpng-dev libjpeg-dev libx11-dev libpixman-1-dev libcairo2-dev libpango1.0-dev libgif-dev build-essential
+local_user=`logname`
+local_user_home_dir=$( getent passwd "${local_user}" | cut -d: -f6 )
+
+# Make sure PATH includes cargo and /sbin
+export PATH="${local_user_home_dir}/.cargo/bin:${PATH}:/sbin/"
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-for app in ${DIR}/../frontends/* ${DIR}/../services/* ${DIR}/../apps/*/frontend ${DIR}/../apps/*/backend; do
+for app in ${DIR}/../apps/*/frontend ${DIR}/../apps/*/backend; do
   if [ -d "${app}" ]; then
     make -C "${app}" bootstrap
   fi

diff --git a/script/src/prod-build/index.ts b/script/src/prod-build/index.ts
@@ -17,7 +17,7 @@ import { rmrf } from './utils/rmrf';
 
 export function main({ stdout }: IO): void {
   // Ensure pipenv places the virtualenv in the project.
-  process.env.PIPENV_VENV_IN_PROJECT = '1';
+  process.env.PIPENV_VENV_IN_PROJECT = '0';
 
   const root = getDependencyGraph(process.cwd(), PackageType.Frontend);
   stdout.write(`ℹ️ Building ${root.path} for production\n`);

diff --git a/services/converter-ms-sems/Makefile b/services/converter-ms-sems/Makefile
@@ -1,11 +1,4 @@
-
-add-ppa:
-	apt-cache search --names-only "^python3.9$$" | grep python || sudo add-apt-repository -y ppa:deadsnakes/ppa # add deadsnakes only if we need to
-
-install-python: add-ppa
-	sudo apt install -y python3.9 python3.9-dev python3-distutils python3-pip
-
-install: install-python
+install: 
 
 install-dependencies:
 	python3.9 -m pip install pipenv
@@ -14,7 +7,9 @@ install-dependencies:
 install-dev-dependencies:
 	python3.9 -m pipenv install --dev
 
-build: install-dependencies
+build: 
+
+build_deprecated: install-dependencies
 
 bootstrap: install build install-dev-dependencies