Skip to content

Commit 895986c

Browse files
committed
fixes
1 parent e431bdf commit 895986c

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

.github/workflows/deploy-to-control-plane.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,9 @@ jobs:
7979
- name: Delete App
8080
if: steps.determine_action.outputs.action == 'delete'
8181
id: delete
82-
uses: ./.github/actions/delete-control-plane-app
83-
continue-on-error: true
84-
with:
85-
app_name: ${{ env.APP_NAME }}
86-
org: ${{ env.CPLN_ORG }}
82+
run: |
83+
echo "🗑️ Deleting review app: $APP_NAME"
84+
${{ github.workspace }}/.github/actions/deploy-to-control-plane/scripts/delete-app.sh
8785
8886
- name: Update Delete Status
8987
if: steps.determine_action.outputs.action == 'delete'

.github/workflows/nightly-remove-stale-review-apps.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,15 @@ jobs:
4545
return stalePRs;
4646
4747
- name: Delete Stale Review Apps
48-
uses: ./.github/actions/delete-control-plane-app
4948
if: ${{ steps.stale_prs.outputs.result != '[]' }}
50-
env:
51-
STALE_PRS: ${{ steps.stale_prs.outputs.result }}
5249
run: |
53-
for pr in $(echo "$STALE_PRS" | jq -r '.[]'); do
50+
for pr in $(echo "${{ steps.stale_prs.outputs.result }}" | jq -r '.[]'); do
5451
APP_NAME="qa-react-webpack-rails-tutorial-pr-$pr"
5552
echo "🗑️ Deleting stale review app for PR #$pr: $APP_NAME"
56-
./.github/actions/delete-control-plane-app/action.yml \
57-
--app_name "$APP_NAME" \
58-
--org "$CPLN_ORG"
53+
${{ github.workspace }}/.github/actions/deploy-to-control-plane/scripts/delete-app.sh
5954
done
55+
env:
56+
APP_NAME: qa-react-webpack-rails-tutorial-pr-${{ steps.stale_prs.outputs.result }}
6057

6158
- name: Run cleanup-images script
6259
run: |

0 commit comments

Comments
 (0)