Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
duniter
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nodes
typescript
duniter
Commits
a925f2c4
Commit
a925f2c4
authored
4 years ago
by
Éloïs
Browse files
Options
Downloads
Patches
Plain Diff
[build] auto install rust
parent
35f1da44
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1315
auto install rust
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+2
-3
2 additions, 3 deletions
.gitlab-ci.yml
neon/build.sh
+17
-0
17 additions, 0 deletions
neon/build.sh
package.json
+3
-3
3 additions, 3 deletions
package.json
test/run.sh
+11
-0
11 additions, 0 deletions
test/run.sh
with
33 additions
and
6 deletions
.gitlab-ci.yml
+
2
−
3
View file @
a925f2c4
...
...
@@ -31,10 +31,7 @@ workflow:
-
. "$NVM_DIR/nvm.sh"
-
nvm install
10
-
nvm use
10
-
curl https://sh.rustup.rs -sSf | sh -s -- -y
-
export PATH="$HOME/.cargo/bin:$PATH"
-
export RUSTFLAGS="-D warnings"
-
rustup show && rustc --version && cargo --version
.cached_nvm
:
&cached_nvm
...
...
@@ -109,6 +106,8 @@ fmt_and_clippy:
-
when
:
on_success
stage
:
quality
script
:
-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-
export PATH="$HOME/.cargo/bin:$PATH"
-
cargo fmt -- --version
-
cargo fmt -- --check
-
cargo clippy -- -V
...
...
This diff is collapsed.
Click to expand it.
neon/build.sh
+
17
−
0
View file @
a925f2c4
...
...
@@ -2,6 +2,23 @@
cd
neon
if
[
-z
"
${
DUNITER_FAST_BUILD
}
"
]
then
if
[
-e
"
${
HOME
}
/.cargo/bin/rustup"
]
then
rustup update stable
else
curl
--proto
'=https'
--tlsv1
.2
-sSf
https://sh.rustup.rs | sh
-s
--
-y
export
PATH
=
"
$HOME
/.cargo/bin:
$PATH
"
fi
rustup show
rustc
--version
cargo
--version
else
echo
"WARNING: you have disabled the automatic update of Rust, remember to update Rust regularly with command
\"
rustup update
\"
."
fi
if
[
"
${
NEON_BUILD_RELEASE
}
"
=
"true"
]
||
[
"
${
NODE_ENV
}
"
=
"production"
]
then
neon build
--release
...
...
This diff is collapsed.
Click to expand it.
package.json
+
3
−
3
View file @
a925f2c4
...
...
@@ -28,9 +28,9 @@
"tsc"
:
"tsc"
,
"tscw"
:
"tsc -w"
,
"doc"
:
"typedoc --out typedoc/ index.ts app/ --mode file --readme README.md --includeDeclarations --sourcefile-url-prefix
\"
https://git.duniter.org/nodes/typescript/duniter/blob/loki/
\"
"
,
"test"
:
"
cargo test --all && nyc --reporter html mocha
"
,
"test:rs"
:
"
cargo test --all
"
,
"test:ts"
:
"
nyc --reporter html mocha
"
,
"test"
:
"
./test/run.sh
"
,
"test:rs"
:
"
./test/run.sh rs
"
,
"test:ts"
:
"
./test/run.sh ts
"
,
"start"
:
"node bin/duniter start"
,
"build"
:
"./neon/build.sh && cd.. && tsc && cd
\"
../node_modules/duniter-ui
\"
&& npm install && npm run build"
,
"install"
:
"./neon/build.sh"
,
...
...
This diff is collapsed.
Click to expand it.
test/run.sh
0 → 100755
+
11
−
0
View file @
a925f2c4
#!/bin/sh
if
[
"
${
1
}
"
=
"rs"
]
then
$HOME
/.cargo/bin/cargo
test
--all
elif
[
"
${
1
}
"
=
"ts"
]
then
nyc
--reporter
html mocha
else
$HOME
/.cargo/bin/cargo
test
--all
&&
nyc
--reporter
html mocha
fi
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment