Update condition for run on PR merge or Push to master (#869)

* Update condition for run on PR merge or Push to master

Update condition for run on PR merge or Push to master

* fix: wpb-24362 update wiab-stag artifact hash, fixed offline.yml workflow and updated wiab-staging docs

Author: mohitrajain

.github/workflows/offline.yml

@@ -2,13 +2,14 @@
 #
 # This workflow builds offline deployment artifacts for different profiles:
 #   - default: Production deployment (includes external charts, ansible, terraform)
-#   - demo: Demo/WIAB deployment (includes databases-ephemeral)
+#   - build-wiab-staging: Wire-in-a-box (wiab-stag) a production like deployment (includes external charts, ansible, terraform)
+#   - wiab-dev: Wire-in-a-box dev deployment (includes databases-ephemeral)
 #   - min: Minimal deployment
 #
 # Build Optimization via PR Labels:
 #   - No label: No builds run (must add label to trigger builds)
 #   - 'build-default': Builds only default profile
-#   - 'build-demo': Builds only demo profile
+#   - 'build-dev': Builds only demo profile
 #   - 'build-wiab-staging' - Builds only wiab-staging profile
 #   - 'build-min': Builds only min profile
 #   - 'build-all': Explicitly builds all profiles (useful for workflow changes)
@@ -33,6 +34,7 @@ jobs:
   build-default:
     name: Build default profile
     if: |
+      (github.event_name == 'push' && github.ref == 'refs/heads/master') ||
       contains(github.event.pull_request.labels.*.name, 'build-all') ||
       contains(github.event.pull_request.labels.*.name, 'build-default') ||
       contains(github.event.pull_request.labels.*.name, 'build-wiab-staging')
@@ -77,6 +79,7 @@ jobs:
     name: Verify default profile
     needs: build-default
     if: |
+      (github.event_name == 'push' && github.ref == 'refs/heads/master') ||
       contains(github.event.pull_request.labels.*.name, 'build-all') ||
       contains(github.event.pull_request.labels.*.name, 'build-default')
     runs-on:
@@ -116,6 +119,7 @@ jobs:
     name: Verify wiab staging profile
     needs: build-default
     if: |
+      (github.event_name == 'push' && github.ref == 'refs/heads/master') ||
       contains(github.event.pull_request.labels.*.name, 'build-all') ||
       contains(github.event.pull_request.labels.*.name, 'build-wiab-staging')
     runs-on:
@@ -176,11 +180,12 @@ jobs:
           DOCKER_LOGIN: '${{ secrets.DOCKER_LOGIN }}'
 
   # Build demo profile
-  build-demo:
+  build-dev:
     name: Build demo profile
     if: |
+      (github.event_name == 'push' && github.ref == 'refs/heads/master') ||
       contains(github.event.pull_request.labels.*.name, 'build-all') ||
-      contains(github.event.pull_request.labels.*.name, 'build-demo')
+      contains(github.event.pull_request.labels.*.name, 'build-dev')
     runs-on:
       group: wire-server-deploy
     steps:
@@ -239,6 +244,7 @@ jobs:
   build-min:
     name: Build min profile
     if: |
+      (github.event_name == 'push' && github.ref == 'refs/heads/master') ||
       contains(github.event.pull_request.labels.*.name, 'build-all') ||
       contains(github.event.pull_request.labels.*.name, 'build-min')
     runs-on:

ansible/inventory/demo/wiab-staging.yml

@@ -6,4 +6,4 @@ wiab-staging:
       ansible_user: 'demo'
       ansible_ssh_private_key_file: "~/.ssh/id_ed25519"
   vars:
-    artifact_hash: e5e1919173f6fe2b56034a57e2dc59e8343e8b8e
+    artifact_hash: f1f624256bdab0f9f76158c7f45e0618ee641237

changelog.d/4-docs/fix-wiab-docs

@@ -0,0 +1 @@
+Fixed: Fixed wiab-staging documentation

offline/wiab-staging.md

@@ -128,7 +128,7 @@ Since the inventory is ready, please continue with the following steps:
 ### Environment Setup
 
 - **[Making tooling available in your environment](docs_ubuntu_22.04.md#making-tooling-available-in-your-environment)**
-  - Source the `bin/offline-env.sh` shell script to set up a `d` alias that runs commands inside a Docker container with all necessary tools for offline deployment.
+  - Source the `bin/offline-env.sh` shell script by running `source bin/offline-env.sh` to set up a `d` alias that runs commands inside a Docker container with all necessary tools for offline deployment.
 
 - **[Generating secrets](docs_ubuntu_22.04.md#generating-secrets)**
   - Run `./bin/offline-secrets.sh` to generate fresh secrets for Minio and coturn services. This creates two secret files: `ansible/inventory/group_vars/all/secrets.yaml` and `values/wire-server/secrets.yaml`.
@@ -147,6 +147,14 @@ Since the inventory is ready, please continue with the following steps:
 - `CERT_MASTER_EMAIL`: email used by cert-manager for ACME registration.
 - `HOST_IP`: public IP that matches your DNS A record (auto-detected if empty).
 
+**TLS / certificate behavior (cert-manager vs. Bring Your Own):**
+- By default, `bin/helm-operations.sh` runs `deploy_cert_manager`, which installs cert-manager and configures a Let’s Encrypt (HTTP-01) issuer for the ingress charts.
+- If you **do not** want Let’s Encrypt / cert-manager (for example, you are using **[Bring Your Own certificates](docs_ubuntu_22.04.md#acquiring--deploying-ssl-certificates)** or you cannot satisfy HTTP-01 requirements), disable this step by commenting out the `deploy_cert_manager` call inside `bin/helm-operations.sh`.
+  - After disabling cert-manager, ensure your ingress is configured with your own TLS secret(s) as described in the TLS documentation below.
+
+**To run the automated helm chart deployment**:
+`d ./bin/helm-operations.sh`
+
 **Charts deployed by the script:**
 - External datastores and helpers: `cassandra-external`, `elasticsearch-external`, `minio-external`, `rabbitmq-external`, `databases-ephemeral`, `reaper`, `fake-aws`, `demo-smtp`.
 - Wire services: `wire-server`, `webapp`, `account-pages`, `team-settings`, `smallstep-accomp`.