workflow reference to main and some fix

pagopa · Mar 5, 2024 · a6773e5 · a6773e5
1 parent 262e8c7
commit a6773e5
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 20 deletions.
diff --git a/.github/workflows/pr_ms.yml b/.github/workflows/pr_ms.yml
@@ -22,7 +22,7 @@ on:
 jobs:
 
   code_review:
-    uses: pagopa/selfcare-commons/.github/workflows/call_code_review_spring.yml@EC-149-template-git-hub-workflows
+    uses: pagopa/selfcare-commons/.github/workflows/call_code_review_spring.yml@main
     name: 'Code Review'
     secrets: inherit
     if: github.base_ref == 'main' && github.event_name == 'pull_request'
@@ -33,5 +33,5 @@ jobs:
       sonar_key: 'pagopa_selfcare-ms-party-registry-proxy'
 
   docker_build:
-    uses: pagopa/selfcare-commons/.github/workflows/call_code_review_docker.yml@EC-149-template-git-hub-workflows
+    uses: pagopa/selfcare-commons/.github/workflows/call_code_review_docker.yml@main
     name: 'Docker'
diff --git a/.github/workflows/release_ms.yml b/.github/workflows/release_ms.yml
@@ -2,6 +2,14 @@ name: Release ms-party-registry-proxy
 
 on:
   workflow_dispatch:
+    inputs:
+      env:
+        type: choice
+        description: Environment
+        options: 
+        - dev
+        - uat
+        - prod
 
   push:
     branches:
@@ -19,28 +27,31 @@ on:
 jobs:
 
   release_dev:
-    uses: pagopa/selfcare-commons/.github/workflows/call_release_docker.yml@EC-149-template-git-hub-workflows
+    uses: pagopa/selfcare-commons/.github/workflows/call_release_docker.yml@main
     name: '[Dev] PartyRegistryProxy ms Release'
-    if: startsWith(github.ref_name, 'releases/') != true
+    if: ${{ (startsWith(github.ref_name, 'releases/') != true && inputs.env == null) || inputs.env == 'dev' }}
     secrets: inherit
     with:
       environment: dev
-      dir: 'infra'
+      tf_environment: dev
+      dir: 'infra/container_apps'
 
   release_uat:
-    uses: pagopa/selfcare-commons/.github/workflows/call_release_docker.yml@EC-149-template-git-hub-workflows
+    uses: pagopa/selfcare-commons/.github/workflows/call_release_docker.yml@main
     name: '[UAT] PartyRegistryProxy ms Release'
-    if: startsWith(github.ref_name, 'releases/')
+    if: ${{ (startsWith(github.ref_name, 'releases/') == true && inputs.env == null) || inputs.env == 'uat' }}
     secrets: inherit
     with:
       environment: uat
-      dir: 'infra'
+      tf_environment: uat
+      dir: 'infra/container_apps'
 
   release_prod:
-    uses: pagopa/selfcare-commons/.github/workflows/call_release_docker.yml@EC-149-template-git-hub-workflows
+    uses: pagopa/selfcare-commons/.github/workflows/call_release_docker.yml@main
     name: '[Prod] PartyRegistryProxy ms Release'
-    if: startsWith(github.ref_name, 'releases/')
+    if: ${{ inputs.env == 'prod' }}
     secrets: inherit
     with:
       environment: prod
-      dir: 'infra'
+      tf_environment: prod
+      dir: 'infra/container_apps'
diff --git a/.github/workflows/release_ms_pnpg.yml b/.github/workflows/release_ms_pnpg.yml
@@ -2,6 +2,14 @@ name: Release PNPG ms-party-registry-proxy
 
 on:
   workflow_dispatch:
+    inputs:
+      env:
+        type: choice
+        description: Environment
+        options: 
+        - dev
+        - uat
+        - prod
 
   push:
     branches:
@@ -19,31 +27,31 @@ on:
 jobs:
 
   release_dev:
-    uses: pagopa/selfcare-commons/.github/workflows/call_release_docker.yml@EC-149-template-git-hub-workflows
+    uses: pagopa/selfcare-commons/.github/workflows/call_release_docker.yml@main
     name: '[Dev] PartyRegistryProxy ms Release'
-    if: startsWith(github.ref_name, 'releases/') != true
+    if: ${{ (startsWith(github.ref_name, 'releases/') != true && inputs.env == null) || inputs.env == 'dev' }}
     secrets: inherit
     with:
       environment: dev
       tf_environment: dev-pnpg
-      dir: 'infra'
+      dir: 'infra/container_apps'
 
   release_uat:
-    uses: pagopa/selfcare-commons/.github/workflows/call_release_docker.yml@EC-149-template-git-hub-workflows
+    uses: pagopa/selfcare-commons/.github/workflows/call_release_docker.yml@main
     name: '[UAT] PartyRegistryProxy ms Release'
-    if: startsWith(github.ref_name, 'releases/')
+    if: ${{ (startsWith(github.ref_name, 'releases/') == true && inputs.env == null) || inputs.env == 'uat' }}
     secrets: inherit
     with:
       environment: uat
       tf_environment: uat-pnpg
-      dir: 'infra'
+      dir: 'infra/container_apps'
 
   release_prod:
-    uses: pagopa/selfcare-commons/.github/workflows/call_release_docker.yml@EC-149-template-git-hub-workflows
+    uses: pagopa/selfcare-commons/.github/workflows/call_release_docker.yml@main
     name: '[Prod] PartyRegistryProxy ms Release'
-    if: startsWith(github.ref_name, 'releases/')
+    if: ${{ inputs.env == 'prod' }}
     secrets: inherit
     with:
       environment: prod
       tf_environment: prod-pnpg
-      dir: 'infra'
+      dir: 'infra/container_apps'