FIX: dev workflow (#198)

* change contract name...again * fixed dev GHA pipeline
sig-net · Feb 12, 2025 · fee281e · fee281e
1 parent f565b57
commit fee281e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 19 deletions.
diff --git a/.github/workflows/deploy-dev-nodes.yml b/.github/workflows/deploy-dev-nodes.yml
@@ -1,6 +1,5 @@
 name: Build Image & Deploy Nodes to Dev
 on:
-  workflow_dispatch:
   pull_request:
     types: [closed]
     branches:
@@ -14,7 +13,7 @@ env:
 
 jobs:
   build:
-    if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -26,7 +25,7 @@ jobs:
           GOOGLE_CREDENTIALS: ${{ secrets.SIG_CREDENTIALS_DEV }}
 
       - name: Build Docker image and push to Google Artifact Registry
-        if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
+        if: github.event.pull_request.merged == true
         id: docker-push-tagged
         uses: docker/build-push-action@v4
         with:
@@ -44,16 +43,3 @@ jobs:
         with:
           credentials_json: '${{ secrets.SIG_CREDENTIALS_DEV }}'
 
-      - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v2'
-        with:
-          install_components: 'kubectl,gke-gcloud-auth-plugin'
-
-      - name: 'Set project'
-        run: 'gcloud config set project near-cs-dev'
-
-      - name: 'Get container credentials'
-        run: 'gcloud container clusters get-credentials dev --location europe-west1'
-
-      - name: 'Rollout k8s node'
-        run: 'kubectl rollout restart deployment multichain-dev-11'
diff --git a/infra/multichain-mainnet/main.tf b/infra/multichain-mainnet/main.tf
@@ -111,9 +111,6 @@ resource "google_compute_global_address" "external_ips" {
   name         = "multichain-mainnet-${count.index}"
   address_type = "EXTERNAL"
 
-  lifecycle {
-    prevent_destroy = true
-  }
 }
 
 resource "google_compute_managed_ssl_certificate" "mainnet_ssl" {

diff --git a/infra/partner-mainnet/main.tf b/infra/partner-mainnet/main.tf
@@ -266,4 +266,5 @@ resource "google_compute_firewall" "app_port" {
     ports    = ["80", "3000"]
   }
 
+  depends_on = [ module.vpc ]
 }
diff --git a/infra/partner-mainnet/network.tf b/infra/partner-mainnet/network.tf
@@ -47,6 +47,7 @@ resource "google_compute_router" "router" {
   network = var.network
   project = var.project_id
   region  = var.region
+  depends_on = [ module.vpc ]
 }
 
 resource "google_compute_router_nat" "nat" {
@@ -56,4 +57,5 @@ resource "google_compute_router_nat" "nat" {
   region                             = var.region
   nat_ip_allocate_option             = "AUTO_ONLY"
   source_subnetwork_ip_ranges_to_nat = "ALL_SUBNETWORKS_ALL_IP_RANGES"
+  depends_on = [ module.vpc ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -266,4 +266,5 @@ resource "google_compute_firewall" "app_port" { @@
         ports    = ["80", "3000"]
       }
+      depends_on = [ module.vpc ]
     }