2
0
Эх сурвалжийг харах

prefix porter cli command with exec (#4157)

d-g-town 2 жил өмнө
parent
commit
0615d7ce21

+ 4 - 3
.github/actions/porter-deploy/action.yml

@@ -36,10 +36,11 @@ runs:
       shell: bash
       id: vars
       run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+    - name: Setup porter
+      uses: porter-dev/setup-porter@v0.1.0
     - name: Deploy stack
-      uses: porter-dev/porter-cli-action@v0.1.0
-      with:
-        command: apply
+      timeout-minutes: 30
+      run: exec porter apply
       env:
         PORTER_CLUSTER: "${{ inputs.cluster }}"
         PORTER_HOST: "${{ inputs.host }}"

+ 2 - 2
dashboard/src/main/home/app-dashboard/new-app-flow/utils.ts

@@ -43,7 +43,7 @@ jobs:
       uses: porter-dev/setup-porter@v0.1.0
     - name: Deploy stack
       timeout-minutes: 30
-      run: porter apply -f ${porterYamlPath}
+      run: exec porter apply -f ${porterYamlPath}
       env:
         PORTER_CLUSTER: ${clusterId}
         PORTER_HOST: https://dashboard.getporter.dev
@@ -91,7 +91,7 @@ jobs:
       uses: porter-dev/setup-porter@v0.1.0
     - name: Build and deploy preview environment
       timeout-minutes: 30
-      run: porter apply -f ${porterYamlPath} --preview
+      run: exec porter apply -f ${porterYamlPath} --preview
       env:
         PORTER_CLUSTER: ${clusterId}
         PORTER_HOST: https://dashboard.getporter.dev

+ 1 - 1
internal/integrations/ci/actions/steps.go

@@ -90,7 +90,7 @@ func getDeployStackStep(
 		path = "porter.yaml"
 	}
 
-	command := fmt.Sprintf("porter apply -f %s", path)
+	command := fmt.Sprintf("exec porter apply -f %s", path)
 	if preview {
 		command = fmt.Sprintf("%s --preview", command)
 	}