Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
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
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
9 changes: 8 additions & 1 deletion .github/workflows/deploy-to-control-plane-review-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,15 @@ name: Deploy PR Review App to Control Plane

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


# Controls when the workflow will run
on:
pull_request:
types: [opened, synchronize, reopened]
push:
branches:
- '**' # Any branch
- '!main' # Except main
- '!master' # Except master
issue_comment:
types: [created]
workflow_dispatch:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/nightly-remove-stale-review-apps.yml
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
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