From 7b05d8dba9977090cdf7d555b95be640ce48c932 Mon Sep 17 00:00:00 2001 From: Judah Meek Date: Wed, 9 Apr 2025 02:14:32 -0500 Subject: [PATCH 1/3] test --- client/app/bundles/comments/components/Footer/Footer.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/bundles/comments/components/Footer/Footer.jsx b/client/app/bundles/comments/components/Footer/Footer.jsx index 74e54176..405d457e 100644 --- a/client/app/bundles/comments/components/Footer/Footer.jsx +++ b/client/app/bundles/comments/components/Footer/Footer.jsx @@ -14,7 +14,7 @@ export default class Footer extends BaseComponent {
- Rails On Maui on X/Twitter + Rails On Maui on X (Twitter)
From 963807aaa2306f6ce025304e372c9d20556eac9a Mon Sep 17 00:00:00 2001 From: Judah Meek Date: Mon, 21 Apr 2025 18:37:07 -0500 Subject: [PATCH 2/3] fixes --- .controlplane/Dockerfile | 9 --------- .github/actions/build-docker-image/action.yml | 2 -- .../workflows/deploy-to-control-plane-staging.yml | 13 ++++++++++++- .../workflows/nightly-remove-stale-review-apps.yml | 7 +++---- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.controlplane/Dockerfile b/.controlplane/Dockerfile index 8462f8e6..8a809700 100644 --- a/.controlplane/Dockerfile +++ b/.controlplane/Dockerfile @@ -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 @@ -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 \ diff --git a/.github/actions/build-docker-image/action.yml b/.github/actions/build-docker-image/action.yml index 04b4e446..45a12434 100644 --- a/.github/actions/build-docker-image/action.yml +++ b/.github/actions/build-docker-image/action.yml @@ -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 }}" diff --git a/.github/workflows/deploy-to-control-plane-staging.yml b/.github/workflows/deploy-to-control-plane-staging.yml index 807fac0d..f3cdf5c0 100644 --- a/.github/workflows/deploy-to-control-plane-staging.yml +++ b/.github/workflows/deploy-to-control-plane-staging.yml @@ -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 + 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: diff --git a/.github/workflows/nightly-remove-stale-review-apps.yml b/.github/workflows/nightly-remove-stale-review-apps.yml index c5f0376a..e511d9ac 100644 --- a/.github/workflows/nightly-remove-stale-review-apps.yml +++ b/.github/workflows/nightly-remove-stale-review-apps.yml @@ -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 @@ -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 From e3afd612535dff82b52dae7499d5d992e3db5ca9 Mon Sep 17 00:00:00 2001 From: Judah Meek Date: Mon, 21 Apr 2025 18:42:07 -0500 Subject: [PATCH 3/3] fixes to my fixes --- .../deploy-to-control-plane-review-app.yml | 9 ++++++++- .../workflows/deploy-to-control-plane-staging.yml | 13 +------------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy-to-control-plane-review-app.yml b/.github/workflows/deploy-to-control-plane-review-app.yml index 7e42222e..1884dfd2 100644 --- a/.github/workflows/deploy-to-control-plane-review-app.yml +++ b/.github/workflows/deploy-to-control-plane-review-app.yml @@ -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: diff --git a/.github/workflows/deploy-to-control-plane-staging.yml b/.github/workflows/deploy-to-control-plane-staging.yml index f3cdf5c0..807fac0d 100644 --- a/.github/workflows/deploy-to-control-plane-staging.yml +++ b/.github/workflows/deploy-to-control-plane-staging.yml @@ -5,21 +5,10 @@ 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 - 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: