Skip to content

Testing Double Checkout as Possible Solution to Review App Deployment from Comment Bug #638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 23, 2025
Merged

Testing Double Checkout as Possible Solution to Review App Deployment from Comment Bug #638

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b05d8d
test
Judahmeek Apr 9, 2025
963807a
fixes
Judahmeek Apr 21, 2025
e3afd61
fixes to my fixes
Judahmeek Apr 21, 2025
1fa421a
remove push trigger
Judahmeek Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .controlplane/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ RUN yarn install --frozen-lockfile
# Copy application code
COPY . .

RUN echo "ZYXYZYXYZ"

RUN ls -l
RUN ls -l app

# Final stage for app image
FROM base

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

RUN ls -l app

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

RUN chmod +x /app/.controlplane/*.sh

ENV RAILS_ENV=production \
Expand Down
2 changes: 0 additions & 2 deletions .github/actions/build-docker-image/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ runs:
fi

echo "🏗️ Building Docker image${PR_INFO} (commit ${{ inputs.commit }})..."

/usr/bin/git log -1 --format=%H

if cpflow build-image -a "${{ inputs.app_name }}" --commit="${{ inputs.commit }}" --org="${{ inputs.org }}"; then
image_tag="${{ inputs.org }}/${{ inputs.app_name }}:${{ inputs.commit }}"
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/deploy-to-control-plane-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,21 @@ run-name: Deploy Control Plane Staging App

# Controls when the workflow will run
on:
pull_request:
types: [opened, synchronize, reopened]
push:
branches:
- '*'
- '**' # Any branch
- '!main' # Except main
- '!master' # Except master
Copy link

@coderabbitai coderabbitai bot Apr 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Invalid branch exclusion syntax in push.branches
GitHub Actions does not support negation patterns (!main, !master) under branches. Use branches-ignore to exclude branches.

-push:
-  branches:
-    - '**'
-    - '!main'
-    - '!master'
+push:
+  branches:
+    - '**'
+  branches-ignore:
+    - main
+    - master

issue_comment:
types: [created]
workflow_dispatch:
inputs:
pr_number:
description: 'Pull Request number to deploy'
required: true
type: number

# Convert the GitHub secret variables to environment variables for use by the Control Plane CLI
env:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/nightly-remove-stale-review-apps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ on:
schedule:
- cron: '0 0 * * *'

env:
CPLN_ORG: ${{secrets.CPLN_ORG_STAGING}}
CPLN_TOKEN: ${{secrets.CPLN_TOKEN_STAGING}}

jobs:
remove-stale-review-apps:
runs-on: ubuntu-latest
Expand All @@ -20,6 +16,9 @@ jobs:

- name: Setup Environment
uses: ./.github/actions/setup-environment
with:
token: ${{ secrets.CPLN_TOKEN_STAGING }}
org: ${{ vars.CPLN_ORG_STAGING }}

- name: Get Stale PRs
id: stale_prs
Expand Down
2 changes: 1 addition & 1 deletion client/app/bundles/comments/components/Footer/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class Footer extends BaseComponent {
</a>
<a href="https://twitter.com/railsonmaui" className="flex gap-4 items-center">
<div className="w-16 h-16 bg-[url('../images/twitter_64.png')]" />
Rails On Maui on X/Twitter
Rails On Maui on X (Twitter)
</a>
</div>
</footer>
Expand Down
Loading