From 2edea8d13c3ec63609dbebb9ac521549e6982499 Mon Sep 17 00:00:00 2001
From: "ry.yamafuji" <ry.yamafuji@gmail.com>
Date: Fri, 5 Dec 2025 22:53:37 +0900
Subject: [PATCH] test

---
 .github/workflows/deploy_to_gcp.yml     | 59 +++++++++++++++++++++++++
 .github/workflows/deploy_to_run_job.yml | 23 ----------
 2 files changed, 59 insertions(+), 23 deletions(-)
 create mode 100644 .github/workflows/deploy_to_gcp.yml
 delete mode 100644 .github/workflows/deploy_to_run_job.yml

diff --git a/.github/workflows/deploy_to_gcp.yml b/.github/workflows/deploy_to_gcp.yml
new file mode 100644
index 0000000..0920e60
--- /dev/null
+++ b/.github/workflows/deploy_to_gcp.yml
@@ -0,0 +1,59 @@
+name: Gitea Deploy to GCP
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - deploy-prd
+      - deploy-dev
+
+jobs:
+  gcp-deploy:  
+    name: Deploy to GCP
+    runs-on: gcloud-tf
+    env:
+      GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
+      GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
+      REPO_NAME: ${{ github.repository }}
+      HASH_SUFFIX: ${{ github.sha }}
+      JOB_NAME: ${{ vars.JOB_NAME }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3        
+
+      - name: Check Deploy Tools       
+        run: |
+          ls -la
+          echo "Checking gcloud and terraform versions..."
+          gcloud --version
+          terraform --version
+          
+      - name: Check Gcloud auth
+        run: |
+          echo "HOME: ${HOME}"
+          printf '%s' "$GCP_SA_KEY" > $HOME/sa.json
+          export GOOGLE_APPLICATION_CREDENTIALS="$HOME/sa.json"
+
+          gcloud auth activate-service-account --key-file="$GOOGLE_APPLICATION_CREDENTIALS"
+          gcloud config set project "$GCP_PROJECT_ID"
+
+          echo "Check gcloud"
+          gcloud config list
+          gcloud --version
+
+      - name: Exec Terraform init shell
+        run: |
+          export GOOGLE_APPLICATION_CREDENTIALS="$HOME/sa.json"
+          ./scripts/deploy/init_terraform.sh
+
+      - name: Exec Container Image Push to Artifact Registry
+        run: |
+          export GOOGLE_APPLICATION_CREDENTIALS="$HOME/sa.json"
+          ./scripts/deploy/build_image_to_gar.sh
+
+      - name: Exec Terraform plan shell
+        run: |
+          export GOOGLE_APPLICATION_CREDENTIALS="$HOME/sa.json"
+          ./scripts/deploy/plan_terraform.sh
+
+
diff --git a/.github/workflows/deploy_to_run_job.yml b/.github/workflows/deploy_to_run_job.yml
deleted file mode 100644
index 6ae31e5..0000000
--- a/.github/workflows/deploy_to_run_job.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Gitea Deploy to GCP AR
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - deploy-prd
-      - deploy-dev
-jobs:
-  gcp-deploy:  
-    name: Deploy to GCP
-    runs-on: ubuntu-latest
-    env:
-      GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
-      GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
-      REPO_NAME: ${{ github.repository }}
-      HASH_SUFFIX: ${{ github.sha }}
-      JOB_NAME: ${{ vars.JOB_NAME }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-