Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Sweep GHA Fix] Fix failing GitHub Actions #19

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions projects/fastgpt/public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@
},
"home": {
"AI Assistant": "AI Assistant",
"AI Assistant Desc": "Both internally and externally, AI will be available to your users 24 hours a day",
"AI Assistant Description": "Both internally and externally, AI will be available to your users 24 hours a day",
"Advanced Settings": "Flow Settings",
"Advanced Settings Desc": "Flow based process orchestration mode, let your AI easily achieve database query, IO operation, networking communication and other expansion capabilities",
"Choice Debug": "Convenient Debugging",
Expand Down Expand Up @@ -789,7 +789,7 @@
"OpenAPI": "OpenAPI",
"OpenAPI Desc": "External interface consistent with GPT API to help you easily access existing applications",
"Quickly build AI question and answer library": "Quickly build AI question and answer library",
"Service status": "Service status",
"Service Status": "Service status",
"Start Now": "Start Now",
"Visual AI orchestration": "Visual AI orchestration",
"Why FastGPT": "Why FastGPT",
Expand Down Expand Up @@ -859,7 +859,7 @@
},
"plugin": {
"Confirm Delete": "Confirm to delete the plugin?",
"Create Your Plugin": "Create Plugin",
"Create Plugin": "Create Plugin",
"Get Plugin Module Detail Failed": "Get plugin detail failed",
"Intro": "Plugin Intro",
"Load Plugin Failed": "Load Plugin Failed",
Expand Down
24 changes: 23 additions & 1 deletion projects/fastgpt/src/pages/components/Choice.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ import { Box, Image, Flex, Grid, useTheme } from '@chakra-ui/react';
import React from 'react';
import { useTranslation } from 'next-i18next';
import MyTooltip from '@/components/MyTooltip';
import React from 'react';
import { useTranslation } from 'next-i18next';
import MyTooltip from '@/components/MyTooltip';

const Choice = () => {
const theme = useTheme();
Expand All @@ -13,31 +16,50 @@ const Choice = () => {
title: t('home.Choice Open'),
desc: t('home.Choice Open Desc'),
tooltip: '前往 GitHub',
onClick: () => window.open('https://github.com/labring/FastGPT', '_blank')
onClick: () => window.open('https://github.com/labring/FastGPT', '_blank'),
title: t('home.Choice Open'),
desc: t('home.Choice Open Desc'),
tooltip: '前往 GitHub',
onClick: () => window.open('https://github.com/labring/FastGPT', '_blank'),
},
{
icon: '/imgs/home/icon_2.svg',
title: t('home.Choice QA'),
desc: t('home.Choice QA Desc'),
tooltip: 'Some tooltip text',
title: t('home.Choice QA'),
desc: t('home.Choice QA Desc')
},
{
icon: '/imgs/home/icon_3.svg',
title: t('home.Choice Visual'),
desc: t('home.Choice Visual Desc'),
tooltip: 'Some tooltip text',
title: t('home.Choice Visual'),
desc: t('home.Choice Visual Desc')
},
{
icon: '/imgs/home/icon_4.svg',
title: t('home.Choice Extension'),
desc: t('home.Choice Extension Desc'),
tooltip: 'Some tooltip text',
title: t('home.Choice Extension'),
desc: t('home.Choice Extension Desc')
},
{
icon: '/imgs/home/icon_5.svg',
title: t('home.Choice Debug'),
desc: t('home.Choice Debug Desc'),
tooltip: 'Some tooltip text',
title: t('home.Choice Debug'),
desc: t('home.Choice Debug Desc')
},
{
icon: '/imgs/home/icon_6.svg',
title: t('home.Choice Models'),
desc: t('home.Choice Models Desc'),
tooltip: 'Some tooltip text',
title: t('home.Choice Models'),
desc: t('home.Choice Models Desc')
}
];
Expand Down
6 changes: 3 additions & 3 deletions projects/xiaoyi/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Install dependencies only when needed
FROM node:18.15-alpine AS deps
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
FROM node:18.15-alpine AS deps \\ && npm install -g pnpm
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat ttf-dejavu might be needed.
RUN apk add libc6-compat && npm install -g pnpm
WORKDIR /app

Expand Down Expand Up @@ -52,4 +52,4 @@ USER nextjs

ENV serverPath=./server.js

ENTRYPOINT ["sh","-c","node ${serverPath}"]
ENTRYPOINT ["sh",-c,"node ${serverPath}"]