Skip to content

Commit

Permalink
Merge branch 'main' into feat-add-ossinsight-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
Mini256 authored Oct 9, 2024
2 parents dbc85ab + de99153 commit 9a45a07
Show file tree
Hide file tree
Showing 68 changed files with 3,272 additions and 468 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/preview.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
shell: bash
working-directory: ./web
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: refs/pull/${{ github.event.pull_request.number }}/merge
ref: ${{ github.event.pull_request.head.sha }}
- name: Use Node.js 18
uses: actions/setup-node@v2.5.1
with:
Expand All @@ -36,9 +36,9 @@ jobs:
shell: bash
working-directory: ./web
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: refs/pull/${{ github.event.pull_request.number }}/merge
ref: ${{ github.event.pull_request.head.sha }}
- name: Use Node.js 18
uses: actions/setup-node@v2.5.1
with:
Expand All @@ -54,6 +54,7 @@ jobs:
SENTRY_DSN: https://ea6017f8ee534468b308a2a6c949895a@o226447.ingest.sentry.io/6588620
AUTH0_DOMAIN: ${{ secrets.AUTH0_DOMAIN }}
AUTH0_CLIENT_ID: ${{ secrets.AUTH0_CLIENT_ID }}
GIFT_APP_API_BASE: ${{ secrets.GIFT_APP_API_BASE }}
OSSINSIGHT_PREVIEW: true
TIDBCLOUD_HOST: staging.tidbcloud.com
run: npm run build
Expand Down
8 changes: 4 additions & 4 deletions etl/lib/importer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -183,16 +183,16 @@ def import!

def upsert_all
puts "start insert #{events.count} records into DB using upsert_all ..."
events.each_slice(20000) do |es|
puts 'bulk insert 20000 records'
events.each_slice(90000) do |es|
puts 'bulk insert 90000 records'
GithubEvent.upsert_all(es)
end
end

def insert_all
puts "start insert #{events.count} records into DB using insert_all ..."
events.each_slice(20000) do |es|
puts 'bulk insert 20000 records'
events.each_slice(90000) do |es|
puts 'bulk insert 90000 records'
GithubEvent.insert_all(es)
end
end
Expand Down
1 change: 1 addition & 0 deletions etl/meta/collections/10079.stable-diffusion-ecosystem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ items:
- AbdBarho/stable-diffusion-webui-docker
- mlc-ai/web-stable-diffusion
- invoke-ai/InvokeAI
- LykosAI/StabilityMatrix
1 change: 1 addition & 0 deletions web/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ plugins/**/*.d.ts
# Special files
src/api/_todo_hardcoded.ts
src/client/linkedin.js
docs/api/sidebar.js
4 changes: 2 additions & 2 deletions web/docs/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Examples:
## Sponsors

<div align="center">
<a href="https://www.pingcap.com/tidb-serverless/?utm_source=ossinsight&utm_medium=referral">
<img src="/img/tidb-cloud-logo-w.png" alt="tidb cloud logo" height="20" />
<a href="https://www.pingcap.com/tidb-cloud-serverless/?utm_source=ossinsight&utm_medium=referral">
<img src="/img/tidb-cloud-logo-o.png" alt="tidb cloud logo" height="20" />
</a>
</div>
2 changes: 1 addition & 1 deletion web/docs/api/sidebar.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions web/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const fs = require('fs');

const HOST = process.env.APP_HOST || 'https://ossinsight.io';
const API_BASE = process.env.APP_API_BASE || 'https://api.ossinsight.io';
const GIFT_APP_API_BASE = process.env.GIFT_APP_API_BASE || 'https://us-west-2.prod.aws.tidbcloud.com';
const DATABASE_URL = process.env.DATABASE_URL || '';
const SENTRY_DSN = process.env.SENTRY_DSN || '';

Expand Down Expand Up @@ -66,6 +67,7 @@ const config = {
path.resolve(__dirname, 'plugins/define'),
{
'process.env.APP_API_BASE': JSON.stringify(API_BASE),
'process.env.GIFT_APP_API_BASE': JSON.stringify(GIFT_APP_API_BASE),
'process.env.SENTRY_DSN': SENTRY_DSN ? JSON.stringify(SENTRY_DSN) : undefined,
}
],
Expand Down Expand Up @@ -232,9 +234,9 @@ const config = {
respectPrefersColorScheme: false,
},
announcementBar: {
id: 'announcement-20230821',
id: 'announcement-20240912',
content:
'<a target="_blank" href="https://next.ossinsight.io/widgets" style="font-weight:bold">✨ Spark Your GitHub Magic: Customize and Share with Your Personalized Widgets!</a>',
'<a target="_blank" href="https://ossinsight.io/open-source-heroes/?utm_source=ossinsight&utm_medium=referral&utm_campaign=plg_OSScontribution_credit_05" style="font-weight:bold">Claim up to $2000 in TiDB Serverless credits for your open-source contributions! -></a>',
backgroundColor: '#4C33B1',
textColor: '#ffffff',
isCloseable: true,
Expand Down Expand Up @@ -304,7 +306,7 @@ const config = {
{ label: 'About OSS Insight', to: '/docs/about' },
{
label: 'About TiDB Cloud',
to: 'https://www.pingcap.com/tidb-serverless?utm_source=ossinsight&utm_medium=referral'
to: 'https://www.pingcap.com/tidb-cloud-serverless/?utm_source=ossinsight&utm_medium=referral'
},
{ label: 'How do we implement OSS Insight?', to: '/blog/why-we-choose-tidb-to-support-ossinsight' },
/* { label: 'Database Stats', to: '/stats' }, */
Expand Down Expand Up @@ -444,10 +446,10 @@ const config = {
logo: {
alt: 'TiDB Cloud Logo',
src: '/img/tidb-cloud-logo-o.png',
href: 'https://www.pingcap.com/tidb-serverless/?utm_source=ossinsight&utm_medium=referral',
href: 'https://www.pingcap.com/tidb-cloud-serverless/?utm_source=ossinsight&utm_medium=referral',
width: 200,
},
copyright: `Copyright &copy; ${new Date().getFullYear()} <a href="https://en.pingcap.com" target="_blank">PingCAP</a>. All Rights Reserved | <a href="https://en.pingcap.com/privacy-policy/" target="_blank">Privacy</a>`,
copyright: `Copyright &copy; ${new Date().getFullYear()} <a href="https://www.pingcap.com" target="_blank">PingCAP</a>. All Rights Reserved | <a href="https://www.pingcap.com/privacy-policy/" target="_blank">Privacy</a>`,
},
prism: {
theme: lightCodeTheme,
Expand Down
Loading

0 comments on commit 9a45a07

Please sign in to comment.