Skip to content

Commit 482345c

Browse files
authored
Merge branch 'appwrite:main' into feat-development-keys
2 parents 9365452 + e77b95d commit 482345c

File tree

5 files changed

+8
-2
lines changed

5 files changed

+8
-2
lines changed

.github/workflows/publish.yml

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
"PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"
4343
"PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY }}"
4444
"SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}"
45+
"SENTRY_RELEASE=${{ github.event.release.tag_name }}"
4546
publish-cloud-stage:
4647
runs-on: ubuntu-latest
4748
steps:

Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ ARG PUBLIC_APPWRITE_ENDPOINT
2424
ARG PUBLIC_GROWTH_ENDPOINT
2525
ARG PUBLIC_STRIPE_KEY
2626
ARG SENTRY_AUTH_TOKEN
27+
ARG SENTRY_RELEASE
2728

2829
ENV PUBLIC_APPWRITE_ENDPOINT=$PUBLIC_APPWRITE_ENDPOINT
2930
ENV PUBLIC_GROWTH_ENDPOINT=$PUBLIC_GROWTH_ENDPOINT
3031
ENV PUBLIC_CONSOLE_MODE=$PUBLIC_CONSOLE_MODE
3132
ENV PUBLIC_STRIPE_KEY=$PUBLIC_STRIPE_KEY
3233
ENV SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN
34+
ENV SENTRY_RELEASE=$SENTRY_RELEASE
3335
ENV NODE_OPTIONS=--max_old_space_size=8192
3436

3537
RUN pnpm run sync && pnpm run build

src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte

-1
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,6 @@
457457
class="link">pricing page</a
458458
>.
459459
</p>
460-
<p>You will not be charged for Phone OTPs before February 10th.</p>
461460
<svelte:fragment slot="aside">
462461
{#if data.organizationUsage.authPhoneTotal}
463462
<div class="u-flex u-main-space-between">

src/routes/(console)/project-[project]/functions/function-[function]/settings/updateSchedule.svelte

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import { func } from '../store';
1212
import { isValueOfStringEnum } from '$lib/helpers/types';
1313
import { Runtime } from '@appwrite.io/console';
14+
import { parseExpression } from 'cron-parser';
1415
1516
const functionId = $page.params.function;
1617
let functionSchedule: string = null;
@@ -24,6 +25,10 @@
2425
if (!isValueOfStringEnum(Runtime, $func.runtime)) {
2526
throw new Error(`Invalid runtime: ${$func.runtime}`);
2627
}
28+
29+
// an error is shown if invalid.
30+
parseExpression(functionSchedule);
31+
2732
await sdk.forProject.functions.update(
2833
functionId,
2934
$func.name,

src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte

-1
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,6 @@
441441
Calculated for all Phone OTP sent across your project. Resets at the start of each
442442
billing cycle.
443443
</p>
444-
<p>You will not be charged for Phone OTPs before February 10th.</p>
445444
<svelte:fragment slot="aside">
446445
{#if data.usage.authPhoneTotal}
447446
<div class="u-flex u-main-space-between">

0 commit comments

Comments
 (0)