fix: update deployment

Merge pull request 'fix: ensure deploy workflow runs' (#2 ) from neoloc/deploy_workflow into master
Reviewed-on: https://git.query.consul/unkin/terraform-nomad/pulls/2
2024-12-28 22:57:17 +11:00 · 2024-12-28 22:47:45 +11:00 · 2024-12-28 22:46:20 +11:00 · 2024-12-28 22:43:19 +11:00 · 2024-12-28 22:39:53 +11:00
3 changed files with 42 additions and 8 deletions
@@ -2,6 +2,9 @@ name: Build

 on:
  pull_request:
+  push:
+    branches:
+      - master

 jobs:
  build:
@@ -14,7 +17,7 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v3

-      - name: Install Terraform/Terragrunt
+      - name: Install Packages
        run: |
          dnf install terraform terragrunt vault jq -y

@@ -22,16 +25,15 @@ jobs:
        env:
          VAULT_ROLEID: ${{ secrets.TERRAFORM_NOMAD_VAULT_ROLEID }}
        run: |
-          env
          make plan

      - name: Show Plans
        run: |
          find /workspace -type f -name "*.plan"

-          #- name: Upload Artifacts
-          #  uses: actions/upload-artifact@v3
-          #  with:
-          #    name: plans
-          #    path: /workspace/unkin/rpmbuilder/dist/*/*.rpm
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: plans
+          path: /workspace/unkin/terraform-nomad/plans/*.plan

@@ -0,0 +1,33 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: almalinux-8
+    container:
+      image: git.query.consul/unkin/almalinux8-runnerdnd:latest
+      options: --privileged
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: plans
+          path: /workspace/unkin/terraform-nomad/plans
+
+      - name: Install Packages
+        run: |
+          dnf install terraform terragrunt vault jq -y
+
+      - name: Run Terraform Apply
+        env:
+          VAULT_ROLEID: ${{ secrets.TERRAFORM_NOMAD_VAULT_ROLEID }}
+        run: |
+          make apply
@@ -21,7 +21,6 @@ clean:

 init:
 	$(call vault_env) && \
-	env | sort && \
 	terragrunt --terragrunt-working-dir $(ENV_DIR) init

 plan: init
Author	SHA1	Message	Date
unkinben	63cc96d602	fix: update deployment Build / build (pull_request) Successful in 39s Details	2024-12-28 22:57:17 +11:00
unkinben	4db2abc990	Merge pull request 'fix: ensure deploy workflow runs' (#2 ) from neoloc/deploy_workflow into master Build / build (push) Successful in 39s Details Deploy / deploy (push) Has been skipped Details Reviewed-on: https://git.query.consul/unkin/terraform-nomad/pulls/2	2024-12-28 22:47:45 +11:00
unkinben	f7fa3bbd47	fix: ensure deploy workflow runs Build / build (pull_request) Successful in 39s Details - changed `on` params	2024-12-28 22:46:20 +11:00
unkinben	2a20398c87	Merge pull request 'feat: initial setup' (#1 ) from neoloc/initial into master Reviewed-on: https://git.query.consul/unkin/terraform-nomad/pulls/1	2024-12-28 22:43:19 +11:00
unkinben	3fe7ea4c36	feat: initial setup Build / build (pull_request) Successful in 42s Details - manage nomad jobs - create makefile - create gitignore - manage terragrunt environments - add build/deploy jobs	2024-12-28 22:39:53 +11:00