Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
bytes-sgx
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Markus Becker
bytes-sgx
Commits
97c13388
Commit
97c13388
authored
5 years ago
by
Taiki Endo
Committed by
Douman
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove a patch for cross
parent
c17e4011
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ci/azure-cross-compile.yml
+1
-11
1 addition, 11 deletions
ci/azure-cross-compile.yml
ci/cross-patch
+0
-22
0 additions, 22 deletions
ci/cross-patch
with
1 addition
and
33 deletions
ci/azure-cross-compile.yml
+
1
−
11
View file @
97c13388
...
...
@@ -30,17 +30,7 @@ jobs:
parameters
:
rust_version
:
${{parameters.rust_version}}
# FIXME(taiki-e): When https://github.com/rust-embedded/cross/pull/169 is
# merged, switch to the installation from crates.io.
# See https://nbsoftsolutions.com/blog/azure-pipelines-for-rust-projects#workaround-cross-compilation
# for the current script.
-
script
:
|
git clone https://github.com/rust-embedded/cross.git
cd cross
git reset --hard fb1cb1d7288151f4349f1cb4c990e0e2281764da #Is broken after this commit (images are not uploaded to new docker hub)
git apply ../ci/cross-patch
cargo install --path .
rm -rf cross
-
script
:
cargo install cross
displayName
:
Install cross
condition
:
not(eq(variables['target'], 'wasm32-unknown-unknown'))
...
...
This diff is collapsed.
Click to expand it.
ci/cross-patch
deleted
100644 → 0
+
0
−
22
View file @
c17e4011
diff --git a/src/docker.rs b/src/docker.rs
index 6ea745d..15fef81 100644
--- a/src/docker.rs
+++ b/src/docker.rs
@@ -62,7 +62,7 @@
pub fn register(target: &Target, verbose: bool) -> Result<()> {
docker_command("run")
.arg("--privileged")
.arg("--rm")
- .arg("-it")
+ .arg("-i")
.arg("ubuntu:16.04")
.args(&["sh", "-c", cmd])
.run(verbose)
@@ -160,7 +160,7 @@
pub fn run(target: &Target,
.args(&["-v", &format!("{}:/rust:Z,ro", sysroot.display())])
.args(&["-v", &format!("{}:/target:Z", target_dir.display())])
.args(&["-w", "/project"])
- .args(&["-it", &image(toml, target)?])
+ .args(&["-i", &image(toml, target)?])
.args(&["sh", "-c", &format!("PATH=$PATH:/rust/bin {:?}", cmd)])
.run_and_get_status(verbose)
}
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