Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Komodo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dragoon
Komodo
Commits
87353766
Verified
Commit
87353766
authored
3 weeks ago
by
STEVAN Antoine
Browse files
Options
Downloads
Patches
Plain Diff
install `cargo-script` and use `make.rs` in CI
parent
f8fa1ad8
No related branches found
No related tags found
1 merge request
!202
use `gitlab.isae-supaero.fr:a.stevan/nob.rs` to build
Pipeline
#8279
passed
3 weeks ago
Stage: fmt
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.github/workflows/ci.yml
+11
-3
11 additions, 3 deletions
.github/workflows/ci.yml
.gitlab-ci.yml
+8
-4
8 additions, 4 deletions
.gitlab-ci.yml
with
19 additions
and
7 deletions
.github/workflows/ci.yml
+
11
−
3
View file @
87353766
...
@@ -17,8 +17,12 @@ jobs:
...
@@ -17,8 +17,12 @@ jobs:
uses
:
actions-rs/toolchain@v1
uses
:
actions-rs/toolchain@v1
with
:
with
:
toolchain
:
stable
toolchain
:
stable
-
name
:
Install dependencies
run
:
|
cargo install cargo-script
-
name
:
Run fmt check
-
name
:
Run fmt check
run
:
make fmt-check
run
:
|
./make.rs fmt --check
test
:
test
:
runs-on
:
ubuntu-latest
runs-on
:
ubuntu-latest
...
@@ -31,8 +35,12 @@ jobs:
...
@@ -31,8 +35,12 @@ jobs:
sudo apt update --yes
sudo apt update --yes
sudo apt upgrade --yes
sudo apt upgrade --yes
sudo apt install protobuf-compiler --yes
sudo apt install protobuf-compiler --yes
cargo install cargo-script
-
name
:
Show configuration
-
name
:
Show configuration
run
:
make show
run
:
|
./make.rs version
-
name
:
Run tests
-
name
:
Run tests
run
:
|
run
:
|
make check clippy test
./make.rs check
./make.rs clippy
./make.rs test
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
8
−
4
View file @
87353766
...
@@ -16,9 +16,10 @@ workflow:
...
@@ -16,9 +16,10 @@ workflow:
fmt
:
fmt
:
stage
:
fmt
stage
:
fmt
before_script
:
-
cargo install cargo-script
script
:
script
:
-
make fmt-check
-
./
make
.rs
fmt
-
-check
test
:
test
:
stage
:
test
stage
:
test
...
@@ -28,7 +29,10 @@ test:
...
@@ -28,7 +29,10 @@ test:
-
apt update --yes
-
apt update --yes
-
apt upgrade --yes
-
apt upgrade --yes
-
apt install protobuf-compiler --yes
-
apt install protobuf-compiler --yes
-
make show
-
cargo install cargo-script
-
./make.rs version
script
:
script
:
-
make check clippy test
-
./make.rs check
-
./make.rs clippy
-
./make.rs test
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