Skip to content

Commit 08c649b

Browse files
Merge upstream develop
2 parents 90398f4 + a9a1b7e commit 08c649b

186 files changed

Lines changed: 6439 additions & 486 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ junit-server.xml
2727
.env.development.local
2828
.env.test.local
2929
.env.production.local
30+
.claude
3031

3132
npm-debug.log*
3233
yarn-debug.log*

.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
include:
22
- local: .gitlab/ci/build_rs_core.yml
33
- local: .gitlab/ci/build_js_sdks.yml
4+
- local: .gitlab/ci/build_server.yml
45

56
stages:
67
- setup

.gitlab/ci/build_server.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
.server-workflow:
2+
image: gitlab.futo.org:5050/devops/manifest-repo/library/docker:latest
3+
rules:
4+
- if: $CI_COMMIT_TAG =~ /^server-/
5+
when: always
6+
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
7+
changes:
8+
- services/server/*
9+
- .gitlab/ci/build_server.yml
10+
- if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
11+
when: never
12+
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
13+
changes:
14+
- services/server/*
15+
- .gitlab/ci/build_server.yml
16+
variables:
17+
RUNNER_SCRIPT_TIMEOUT: 179m
18+
DOCKER_FULL_IMAGE_NAME: '${CI_REGISTRY}/${CI_PROJECT_PATH}'
19+
RUST_IMAGE: '${CI_REGISTRY}/${CI_PROJECT_PATH}:base'
20+
before_script:
21+
- cd services/server
22+
23+
.server-rust-base:
24+
extends: .server-workflow
25+
image: ${RUST_IMAGE}
26+
stage: check
27+
28+
server-format-check:
29+
extends: .server-rust-base
30+
script:
31+
- cargo fmt --check
32+
33+
server-clippy:
34+
extends: .server-rust-base
35+
script:
36+
- cargo clippy -- -D warnings
37+
38+
server-build:
39+
extends: .server-rust-base
40+
stage: build
41+
script:
42+
- cargo build --release
43+
artifacts:
44+
paths:
45+
- target/release/server
46+
expire_in: 1 week

.vscode/settings.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
{
2-
"eslint.workingDirectories": [{ "pattern": "packages/*" }],
2+
"eslint.workingDirectories": [
3+
{
4+
"pattern": "packages/*"
5+
}
6+
],
37
"editor.suggest.showSnippets": false,
4-
"editor.formatOnSave": false,
8+
"editor.formatOnSave": true,
59
"editor.codeActionsOnSave": {
610
"source.fixAll": "explicit",
711
"source.organizeImports": "explicit",

0 commit comments

Comments
 (0)