Skip to content

Commit 7747cb6

Browse files
committed
update ci
1 parent 966c745 commit 7747cb6

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

.github/workflows/desktop_ci.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
- Cargo.toml
2121
- Cargo.lock
2222
jobs:
23-
ci:
23+
desktop_ci:
2424
strategy:
2525
fail-fast: false
2626
matrix:
@@ -47,3 +47,11 @@ jobs:
4747
platform: ${{ matrix.platform }}
4848
- run: cargo check -p desktop
4949
- run: cargo test -p desktop
50+
51+
ci:
52+
if: always()
53+
needs: [desktop_ci]
54+
runs-on: ubuntu-latest
55+
steps:
56+
- run: exit 1
57+
if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')

.github/workflows/web_ci.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,7 @@ on:
1717
- packages/**
1818
jobs:
1919
ci:
20-
strategy:
21-
fail-fast: false
22-
matrix:
23-
include:
24-
- platform: "macos"
25-
runner: "macos-14"
26-
runs-on: ${{ matrix.runner }}
20+
runs-on: depot-ubuntu-24.04-4
2721
env:
2822
ARGOS_TOKEN: ${{ secrets.ARGOS_TOKEN }}
2923
steps:
@@ -34,8 +28,7 @@ jobs:
3428
- run: pnpm -F web typecheck
3529
- uses: ./.github/actions/wait-for-netlify-preview
3630
if: github.event_name == 'pull_request'
37-
- name: Set BASE_URL for main branch
38-
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
31+
- if: github.event_name == 'push' && github.ref == 'refs/heads/main'
3932
run: echo "BASE_URL=https://hyprnote.netlify.app" >> "$GITHUB_ENV"
4033
- run: pnpm exec playwright install --with-deps chromium
4134
working-directory: apps/web

apps/web/src/routes/_view/about.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { Icon } from "@iconify-icon/react";
12
import { createFileRoute, useNavigate } from "@tanstack/react-router";
23
import { Mail, Menu, X, XIcon } from "lucide-react";
34
import { AnimatePresence, motion } from "motion/react";
@@ -13,7 +14,6 @@ import { cn } from "@hypr/utils";
1314

1415
import { Image } from "@/components/image";
1516
import { MockWindow } from "@/components/mock-window";
16-
import { Icon } from "@iconify-icon/react";
1717

1818
type AboutSearch = {
1919
type?: "story" | "founder" | "photo";
@@ -26,8 +26,8 @@ export const Route = createFileRoute("/_view/about")({
2626
return {
2727
type:
2828
search.type === "story" ||
29-
search.type === "founder" ||
30-
search.type === "photo"
29+
search.type === "founder" ||
30+
search.type === "photo"
3131
? search.type
3232
: undefined,
3333
id: typeof search.id === "string" ? search.id : undefined,
@@ -613,7 +613,7 @@ function FoundersSidebar({
613613
className={cn([
614614
"w-full bg-stone-50 border rounded-lg p-3 hover:border-stone-400 hover:bg-stone-100 transition-colors text-left flex items-center gap-3 cursor-pointer",
615615
selectedItem?.type === "founder" &&
616-
selectedItem.data.id === founder.id
616+
selectedItem.data.id === founder.id
617617
? "border-stone-600 bg-stone-100"
618618
: "border-neutral-200",
619619
])}
@@ -667,7 +667,7 @@ function TeamPhotosSidebar({
667667
className={cn([
668668
"w-full bg-stone-50 border rounded-lg p-3 hover:border-stone-400 hover:bg-stone-100 transition-colors text-left flex items-center gap-3 cursor-pointer",
669669
selectedItem?.type === "photo" &&
670-
selectedItem.data.id === photo.id
670+
selectedItem.data.id === photo.id
671671
? "border-stone-600 bg-stone-100"
672672
: "border-neutral-200",
673673
])}

0 commit comments

Comments
 (0)