Skip to content

Commit 9894731

Browse files
authored
Testing Double Checkout as Possible Solution to Review App Deployment from Comment Bug (#638)
1 parent c24e9f7 commit 9894731

File tree

5 files changed

+7
-17
lines changed

5 files changed

+7
-17
lines changed

.controlplane/Dockerfile

-9
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ RUN yarn install --frozen-lockfile
4646
# Copy application code
4747
COPY . .
4848

49-
RUN echo "ZYXYZYXYZ"
50-
51-
RUN ls -l
52-
RUN ls -l app
53-
5449
# Final stage for app image
5550
FROM base
5651

@@ -63,10 +58,6 @@ RUN apt-get update -qq && \
6358
COPY --from=build /usr/local/bundle /usr/local/bundle
6459
COPY --from=build /app /app
6560

66-
RUN ls -l app
67-
68-
RUN cat /app/client/app/bundles/comments/components/Footer/Footer.jsx
69-
7061
RUN chmod +x /app/.controlplane/*.sh
7162

7263
ENV RAILS_ENV=production \

.github/actions/build-docker-image/action.yml

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ runs:
2828
fi
2929
3030
echo "🏗️ Building Docker image${PR_INFO} (commit ${{ inputs.commit }})..."
31-
32-
/usr/bin/git log -1 --format=%H
3331
3432
if cpflow build-image -a "${{ inputs.app_name }}" --commit="${{ inputs.commit }}" --org="${{ inputs.org }}"; then
3533
image_tag="${{ inputs.org }}/${{ inputs.app_name }}:${{ inputs.commit }}"

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ name: Deploy PR Review App to Control Plane
22

33
run-name: Deploy PR Review App - PR #${{ github.event.pull_request.number || github.event.issue.number || github.event.inputs.pr_number }}
44

5-
5+
# Controls when the workflow will run
66
on:
7+
pull_request:
8+
types: [opened, synchronize, reopened]
79
issue_comment:
810
types: [created]
911
workflow_dispatch:

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ on:
66
schedule:
77
- cron: '0 0 * * *'
88

9-
env:
10-
CPLN_ORG: ${{secrets.CPLN_ORG_STAGING}}
11-
CPLN_TOKEN: ${{secrets.CPLN_TOKEN_STAGING}}
12-
139
jobs:
1410
remove-stale-review-apps:
1511
runs-on: ubuntu-latest
@@ -20,6 +16,9 @@ jobs:
2016

2117
- name: Setup Environment
2218
uses: ./.github/actions/setup-environment
19+
with:
20+
token: ${{ secrets.CPLN_TOKEN_STAGING }}
21+
org: ${{ vars.CPLN_ORG_STAGING }}
2322

2423
- name: Get Stale PRs
2524
id: stale_prs

client/app/bundles/comments/components/Footer/Footer.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default class Footer extends BaseComponent {
1414
</a>
1515
<a href="https://twitter.com/railsonmaui" className="flex gap-4 items-center">
1616
<div className="w-16 h-16 bg-[url('../images/twitter_64.png')]" />
17-
Rails On Maui on X/Twitter
17+
Rails On Maui on X (Twitter)
1818
</a>
1919
</div>
2020
</footer>

0 commit comments

Comments
 (0)