Skip to content

Appsync/fix ci#186

Open
cloutierMat wants to merge 5 commits intomainfrom
appsync/fix-ci
Open

Appsync/fix ci#186
cloutierMat wants to merge 5 commits intomainfrom
appsync/fix-ci

Conversation

@cloutierMat
Copy link
Copy Markdown
Member

@cloutierMat cloutierMat commented Mar 18, 2026

Motivation

I realized we had security warnings related to the cdk directory. It also lead me to realise that the ci has been broken for a long time. I had assumed the pr were auto merge only when the test were green so never really bothered to have a second look.

Along with #185 this pr fixes this issue

while #185 fixes the tests themselves as no longer compatible with latest versions, this pr aims to prevent this from happening again.

Changes

  • Dependabot will now also look to update packages in /cdk
  • upgraded node version to match LocalStack node version
  • Ensure we don't merge if tests are failing and write a message to our attention instead

@cloutierMat cloutierMat marked this pull request as ready for review March 19, 2026 16:29
@cloutierMat cloutierMat requested a review from simonrw March 23, 2026 17:12
Copy link
Copy Markdown
Collaborator

@simonrw simonrw left a comment

Choose a reason for hiding this comment

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

I trust that this is an improvement, but I think there's a simpler way to support automerging. I think the issue is more that we don't have any branch protection rules, so the "auto merge" logic sees the tests pass, that no tests are required to pass, and therefore it merges the PR. If we put a protection rule on the main branch that states that PRs must be green and jobs a, b, and c are required to pass before the PR is green then the auto-merge system should work. WDYT?

Comment on lines +14 to +15
TEST_IMAGE_NAME: public.ecr.aws/lambda/nodejs:22
NODE_VERSION: 22
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

IDK if this works, but...

Suggested change
TEST_IMAGE_NAME: public.ecr.aws/lambda/nodejs:22
NODE_VERSION: 22
NODE_VERSION: 22
TEST_IMAGE_NAME: public.ecr.aws/lambda/nodejs:${NODE_VERSION}

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This is pretty telling... 😂

image

@cloutierMat
Copy link
Copy Markdown
Member Author

The issue with adding branch protection rules, is that the auto-merge runs on:pull-request which mean it would simply fail, as it currently auto-merges as soon as created.

Looking a bit more into it now, we can instead use on: workflow_run, which will run it only after the run as completed. Much better than my current fix to wait that it completes. Thanks for the pushback leading to more thought process 🧠 😄

@cloutierMat cloutierMat requested a review from simonrw April 1, 2026 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants