correct deployment

micro-nova · Jul 3, 2024 · 1f6ebc1 · 1f6ebc1
1 parent df3961a
commit 1f6ebc1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -13,6 +13,8 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
+        with:
+          submodules: 'true'
       - name: log in to GCP
         id: auth
         uses: google-github-actions/auth@v2
@@ -24,8 +26,8 @@ jobs:
       - name: 'Set up gcloud'
         uses: 'google-github-actions/setup-gcloud@v2'
       - name: Build & deploy site
-        steps:
-        - run: apt install hugo
-        - run: hugo
-        - run: hugo deploy
-        - run: gcloud compute url-maps invalidate-cdn-cache blog-prod --path "/*" --async
+        run: |
+          sudo apt install hugo
+          hugo
+          hugo deploy
+          gcloud compute url-maps invalidate-cdn-cache blog-prod --path "/*" --async
diff --git a/opentofu/deploy.tf b/opentofu/deploy.tf
@@ -79,7 +79,7 @@ resource "google_project_iam_binding" "static_site_bucket" {
 
   condition {
     title      = "only_static_bucket_contents"
-    expression = "resource.type == 'storage.googleapis.com/Object' && resource.name.startsWith('projects/_/buckets/${google_storage_bucket.static_site.name}/')"
+    expression = "resource.name.startsWith('projects/${data.google_project.project.project_id}/buckets/${google_storage_bucket.static_site.name}/')"
   }
 }