From f68caec7433d5cbe7d877600b32f7c09a50b40e9 Mon Sep 17 00:00:00 2001
From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com>
Date: Wed, 29 May 2024 13:02:22 -0400
Subject: [PATCH 1/8] feat: Adding cli as a function deployment type

---
 .../functions/function-[function]/deploymentSource.svelte       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte b/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte
index d4a9bf35c..0c5b765de 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte
@@ -33,4 +33,6 @@
     </DropList>
 {:else if deployment.type === 'manual'}
     <span class="icon-code" aria-hidden="true" /> <span>Manual</span>
+{:else if deployment.type === 'cli'}
+    <span class="icon-terminal" aria-hidden="true" /> <span>CLI</span>
 {/if}

From ce8aa2bdda3b99d682495a3ac83764bd984e0070 Mon Sep 17 00:00:00 2001
From: Khushboo Verma <43381712+vermakhushboo@users.noreply.github.com>
Date: Thu, 30 May 2024 14:03:26 +0530
Subject: [PATCH 2/8] Mark entrypoint as required for manual function creation

---
 src/lib/wizards/functions/steps/configuration.svelte           | 3 ++-
 .../functions/function-[function]/createManual.svelte          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lib/wizards/functions/steps/configuration.svelte b/src/lib/wizards/functions/steps/configuration.svelte
index b951796e7..d8afed74b 100644
--- a/src/lib/wizards/functions/steps/configuration.svelte
+++ b/src/lib/wizards/functions/steps/configuration.svelte
@@ -22,7 +22,8 @@
             label="Entrypoint"
             id="entrypoint"
             placeholder="Entrypoint"
-            bind:value={$createFunction.entrypoint} />
+            bind:value={$createFunction.entrypoint}
+            required />
         <Collapsible>
             <CollapsibleItem>
                 <svelte:fragment slot="title">Build commands</svelte:fragment>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte b/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte
index dc747b543..91507d198 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte
@@ -75,7 +75,8 @@
             label="Entrypoint"
             id="entrypoint"
             placeholder="Entrypoint"
-            bind:value={entrypoint} />
+            bind:value={entrypoint}
+            required />
         {#if $func.version !== 'v3'}
             <Alert type="info">
                 <svelte:fragment slot="title">

From 2629101104038d2ad6fd2cdb51599beb2444a05b Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Fri, 31 May 2024 14:37:40 +0200
Subject: [PATCH 3/8] tests: fix flaky locator

---
 tests/e2e/journeys/upgrade-free-tier.spec.ts | 2 +-
 tests/e2e/steps/pro-project.ts               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/journeys/upgrade-free-tier.spec.ts b/tests/e2e/journeys/upgrade-free-tier.spec.ts
index 63b58b53d..d4c8c8481 100644
--- a/tests/e2e/journeys/upgrade-free-tier.spec.ts
+++ b/tests/e2e/journeys/upgrade-free-tier.spec.ts
@@ -10,7 +10,7 @@ test('upgrade - free tier', async ({ page }) => {
         await page.getByRole('link', { name: 'upgrade' }).click();
         await page.waitForURL('/console/organization-**/change-plan');
         await page.locator('input[value="tier-1"]').click();
-        await page.getByRole('button', { name: ' Add', exact: true }).click();
+        await page.getByRole('button', { name: 'add' }).first().click();
         await enterCreditCard(page);
         // skip members
         await page.getByRole('button', { name: 'change plan' }).click();
diff --git a/tests/e2e/steps/pro-project.ts b/tests/e2e/steps/pro-project.ts
index 287510713..2297dbedb 100644
--- a/tests/e2e/steps/pro-project.ts
+++ b/tests/e2e/steps/pro-project.ts
@@ -24,7 +24,7 @@ export async function createProProject(page: Page): Promise<Metadata> {
         await page.locator('id=plan').selectOption('tier-1');
         await page.getByRole('button', { name: 'get started' }).click();
         await page.waitForURL('/console/create-organization**');
-        await page.getByRole('button', { name: ' Add', exact: true }).click();
+        await page.getByRole('button', { name: 'Add' }).first().click();
         await enterCreditCard(page);
         // skip members
         await page.getByRole('button', { name: 'create organization' }).click();

From 4fbc23df94641b8aa2d12b7eaed2f085d90ce000 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Fri, 31 May 2024 14:52:21 +0200
Subject: [PATCH 4/8] ci: fix target branch for e2e

---
 .github/workflows/e2e.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 488e054ba..a78131473 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -15,6 +15,8 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
+              with:
+                  ref: '${{ github.event.pull_request.merge_commit_sha }}'
             - name: Use Node.js
               uses: actions/setup-node@v3
               with:

From a55b8b66af13ad5347f223d6ae7ff8bb102604cd Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Fri, 31 May 2024 14:53:40 +0200
Subject: [PATCH 5/8] ci: fix target branch for e2e

---
 .github/workflows/e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index a78131473..e95f9ddd8 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -16,7 +16,7 @@ jobs:
         steps:
             - uses: actions/checkout@v3
               with:
-                  ref: '${{ github.event.pull_request.merge_commit_sha }}'
+                  ref: 'refs/pull/${{ github.event.number }}/merge'
             - name: Use Node.js
               uses: actions/setup-node@v3
               with:

From b4672a7002b8c4bb460c68c2d0c79f7c2462c3a3 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Fri, 31 May 2024 14:56:08 +0200
Subject: [PATCH 6/8] ci: fix target branch for e2e

---
 .github/workflows/e2e.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index e95f9ddd8..dfb96405a 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -14,9 +14,9 @@ jobs:
     e2e:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
-                  ref: 'refs/pull/${{ github.event.number }}/merge'
+                  ref: ${{ github.event.pull_request.head.sha }}
             - name: Use Node.js
               uses: actions/setup-node@v3
               with:

From aecafb1f6d76966ade9ad06f340f8a3a1dfed9eb Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Fri, 31 May 2024 15:03:10 +0200
Subject: [PATCH 7/8] test

---
 .npmrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.npmrc b/.npmrc
index b6f27f135..208760c76 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1,2 @@
 engine-strict=true
+test
\ No newline at end of file

From f8de3710665d755d1b7f7edba5758a62ac70ac1f Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Fri, 31 May 2024 15:06:51 +0200
Subject: [PATCH 8/8] Revert "test"

---
 .npmrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.npmrc b/.npmrc
index 208760c76..b6f27f135 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,2 +1 @@
 engine-strict=true
-test
\ No newline at end of file