Some clean ups and typographical errors

1. Some code had some staging logics, removed them

.github/workflows/ci.yaml

@@ -24,6 +24,7 @@ jobs:
     - name: Run tests and lint
       run: make ci
 
+  # Deploys only to Prod, for PR workflow, refer ./pr.yaml
   deploy:
     runs-on: ubuntu-latest
     # Run on main branch or release
@@ -43,17 +44,6 @@ jobs:
         node-version: 20
     - name: Install TailwindCSS
       run: npm ci
-    - name: Write deploy variables
-      id: vars
-      run: |
-        if [ "${{ github.event_name }}" == "release" -o "${GITHUB_REF#refs/heads/}" == "main" ]
-        then
-          echo "DEPLOY_ENV=prod" >> $GITHUB_ENV
-        else
-          echo "DEPLOY_ENV=unknown" >> $GITHUB_ENV
-        fi
-    - name: Dump deployment variables
-      run: echo "DELPLOY_ENV=${DEPLOY_ENV}"
     - uses: "google-github-actions/auth@v2"
       with:
         create_credentials_file: true
@@ -72,4 +62,4 @@ jobs:
         gcloud auth configure-docker ${REGION}-docker.pkg.dev
     - name: Build image and deploy
       run: |
-        make deploy-${DEPLOY_ENV}
+        make deploy-prod

.github/workflows/pr.yaml

@@ -52,17 +52,6 @@ jobs:
         GITHUB_PR: ${{ github.event.number }}
       run: |
         go run ./infra/cmd/preview/main.go -dry-run=false
-    - name: Write deploy variables
-      id: vars
-      run: |
-        if [ "${{ contains( github.event.pull_request.labels.*.name, 'preview') }}" == "true" ]
-        then
-          echo "DEPLOY_ENV=pr-${{ github.event.number }}" >> $GITHUB_ENV
-        else
-          echo "DEPLOY_ENV=unknown" >> $GITHUB_ENV
-        fi
-    - name: Dump deployment variables
-      run: echo "DELPLOY_ENV=${DEPLOY_ENV}"
     - name: Setup node
       uses: actions/setup-node@v4
       with:
@@ -81,6 +70,8 @@ jobs:
         gcloud auth configure-docker ${REGION}-docker.pkg.dev
     - name: Build image and deploy
       run: |
+        echo "DEPLOY_ENV=pr-${{ github.event.number }}" >> $GITHUB_ENV
+        echo "DEPLOY_ENV: ${{ github.event.number }}"
         go run ./cmd/ci/ci.go -deploy=${DEPLOY_ENV}
   destroy:
     runs-on: ubuntu-latest

Makefile

@@ -33,10 +33,6 @@ ci: pr
 preview:
 	$(CI_CMD) -preview
 
-.PHONY: deploy-staging
-deploy-staging:
-	$(CI_CMD) -deploy=staging
-
 .PHONY: deploy-prod
 deploy-prod:
 	$(CI_CMD) -deploy=prod

README.md

@@ -61,9 +61,9 @@ make pr
 
 ## Releasing
 
-Pushing to the `main` branch deploys the changes to the staging environment <https://staging.verifa.io>
+Tagging a `preview` to the pull request makes deploys it to the staging/PR environment <https://pr-xyx.verifa.io>
 
-Tagging a version makes deploys it to the production environment <https://verifa.io>
+Merging to the `main` branch deploys the changes to the production environment <https://verifa.io>
 
 ## Contributing
 

cmd/ci/ci.go

@@ -59,7 +59,7 @@ func main() {
 		&deploy,
 		"deploy",
 		"",
-		"deploy the website to this env (staging or prod)",
+		"deploy the website to this env (pr env or prod)",
 	)
 	flag.BoolVar(&preview, "preview", false, "run a local preview environment")
 	flag.BoolVar(&pr, "pr", false, "run the pull request checks")
@@ -319,8 +319,6 @@ func HasGitDiff(ctx context.Context) {
 func Deploy(ctx context.Context, deploy string) {
 	var cloudRunService string
 	switch deploy {
-	case "staging":
-		cloudRunService = cloudRunServiceStaging
 	case "prod":
 		cloudRunService = cloudRunServiceProd
 	default: