Skip to content

Commit bff4b5b

Browse files
authored
Merge pull request #1488 from o1-labs/dw/remove-duplicated-env
Frontend: remove producer and block-producers env
2 parents 612d309 + 11e8474 commit bff4b5b

File tree

11 files changed

+6
-182
lines changed

11 files changed

+6
-182
lines changed

.github/scripts/docker/test-frontend-docker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set -euo pipefail
1717
if [ $# -lt 2 ]; then
1818
echo "Usage: $0 <image> <environment> [port]"
1919
echo ""
20-
echo "Supported environments: local, webnode, production, development, producer, fuzzing"
20+
echo "Supported environments: local, webnode, production, fuzzing, leaderboard, staging"
2121
echo ""
2222
echo "Examples:"
2323
echo " $0 o1labs/mina-rust-frontend:latest production"
@@ -31,7 +31,7 @@ PORT="${3:-8080}"
3131
CONTAINER_NAME="test-frontend-${ENVIRONMENT}-$$"
3232

3333
# Supported environments
34-
SUPPORTED_ENVS="local webnode production development producer fuzzing"
34+
SUPPORTED_ENVS="local webnode production fuzzing leaderboard staging"
3535
if [[ ! " $SUPPORTED_ENVS " =~ \ $ENVIRONMENT\ ]]; then
3636
echo "❌ Unsupported environment: $ENVIRONMENT"
3737
echo "Supported environments: $SUPPORTED_ENVS"

.github/workflows/docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ jobs:
210210
- push-frontend-image
211211
strategy:
212212
matrix:
213-
environment: [local, webnode, production, producer, fuzzing]
213+
environment: [local, webnode, production, fuzzing]
214214
steps:
215215
- name: Git checkout
216216
uses: actions/checkout@v5

frontend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# Generated by running: ./generate-docker-env.sh
2626
#
2727
# REQUIRED ENVIRONMENT VARIABLES:
28-
# MINA_FRONTEND_ENVIRONMENT - Frontend configuration (local|webnode|production|development|producer|fuzzing)
28+
# MINA_FRONTEND_ENVIRONMENT - Frontend configuration (local|webnode|production|fuzzing|leaderboard|staging)
2929
#
3030
# USAGE:
3131
# # Generate .env.docker with current git information

frontend/Makefile

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ build-production-sentry: ## Build the frontend for production with Sentry source
3030
dist/frontend/browser/assets/environments/env.js
3131
$(MAKE) sentry-sourcemaps
3232

33-
.PHONY: build-producer
34-
build-producer: ## Build the frontend with producer configuration
35-
npx ng build --configuration producer
36-
cp dist/frontend/browser/assets/environments/producer.js \
37-
dist/frontend/browser/assets/environments/env.js
38-
3933
.PHONY: build-production
4034
build-production: ## Build the frontend with production configuration
4135
npx ng build --configuration production
@@ -59,12 +53,6 @@ build-staging: ## Build the frontend with staging configuration
5953
cp dist/frontend/browser/assets/environments/staging.js \
6054
dist/frontend/browser/assets/environments/env.js
6155

62-
.PHONY: build-block-producers
63-
build-block-producers: ## Build the frontend with block-producers configuration
64-
npx ng build --configuration production
65-
cp dist/frontend/browser/assets/environments/block-producers.js \
66-
dist/frontend/browser/assets/environments/env.js
67-
6856
.PHONY: build-leaderboard-sentry
6957
build-leaderboard-sentry: ## Build the frontend with leaderboard configuration and Sentry sourcemaps
7058
npx ng build --configuration production

frontend/angular.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,6 @@
106106
}
107107
],
108108
"outputHashing": "all"
109-
},
110-
"producer": {
111-
"fileReplacements": [
112-
{
113-
"replace": "src/environments/environment.ts",
114-
"with": "src/environments/environment.producer.ts"
115-
}
116-
],
117-
"outputHashing": "all"
118109
}
119110
},
120111
"defaultConfiguration": "production"

frontend/docker/startup.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ build_frontend() {
2828
# Uses Angular production configuration and production.js runtime
2929
make build-production
3030
;;
31-
"producer")
32-
# Uses Angular producer configuration and producer.js runtime
33-
make build-producer
34-
;;
3531
"webnode")
3632
# Uses Angular webnode-local configuration and webnode.js runtime
3733
make build-webnode
@@ -44,13 +40,9 @@ build_frontend() {
4440
# Uses Angular production configuration with staging.js runtime
4541
make build-staging
4642
;;
47-
"block-producers")
48-
# Uses Angular production configuration with block-producers.js runtime
49-
make build-block-producers
50-
;;
5143
*)
5244
echo "Error: Unknown environment '$environment'"
53-
echo "Available environments: local, fuzzing, production, producer, webnode, leaderboard, staging, block-producers"
45+
echo "Available environments: local, fuzzing, production, webnode, leaderboard, staging"
5446
exit 1
5547
;;
5648
esac
@@ -66,7 +58,7 @@ build_frontend() {
6658
# Validate that MINA_FRONTEND_ENVIRONMENT is set
6759
if [ -z "$MINA_FRONTEND_ENVIRONMENT" ]; then
6860
echo "Error: MINA_FRONTEND_ENVIRONMENT environment variable is required."
69-
echo "Available environments: local, fuzzing, production, producer, webnode, leaderboard, staging, block-producers"
61+
echo "Available environments: local, fuzzing, production, webnode, leaderboard, staging"
7062
echo "Example: docker run -e MINA_FRONTEND_ENVIRONMENT=webnode mina-frontend"
7163
exit 1
7264
fi

frontend/public/environments/block-producers.js

Lines changed: 0 additions & 32 deletions
This file was deleted.

frontend/public/environments/producer.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

frontend/src/assets/environments/block-producers.js

Lines changed: 0 additions & 32 deletions
This file was deleted.

frontend/src/assets/environments/producer.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)