Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI. #396

Merged
merged 2 commits into from
Mar 12, 2020
Merged

Fix CI. #396

merged 2 commits into from
Mar 12, 2020

Conversation

reitermarkus
Copy link
Member

Consolidates #395 and #394.

@reitermarkus reitermarkus requested review from Dylan-DPC-zz and a team as code owners March 12, 2020 19:45
@reitermarkus
Copy link
Member Author

bors try

@reitermarkus
Copy link
Member Author

bors r+

@bors
Copy link
Contributor

bors bot commented Mar 12, 2020

Build succeeded

@bors bors bot merged commit 34b4041 into cross-rs:master Mar 12, 2020
@reitermarkus reitermarkus deleted the fix-ci branch March 12, 2020 21:52
@bors
Copy link
Contributor

bors bot commented Mar 13, 2020

try

Merge conflict

Alexhuszagh added a commit to Alexhuszagh/cross that referenced this pull request Jun 7, 2022
This undoes cross-rs#396, and updates the dragonfly version from 4.6.1 to 6.0.1.
This also fixes a few minor issues in the image previously:

- Brace expansion isn't quoted, so it properly expands.
- Archive files are downloaded to the temp directory, and deleted with
  the image.
Alexhuszagh added a commit to Alexhuszagh/cross that referenced this pull request Jun 7, 2022
This undoes cross-rs#396, and updates the dragonfly version from 4.6.1 to 6.0.1.
This also fixes a few minor issues in the image previously:

- Brace expansion isn't quoted, so it properly expands.
- Archive files are downloaded to the temp directory, and deleted with
  the image.
bors bot added a commit that referenced this pull request Jun 7, 2022
762: Re-enable x86_64-unknown-dragonfly target. r=Emilgardis a=Alexhuszagh

This undoes #396, and updates the dragonfly version from 4.6.1 to 6.0.1.
This also fixes a few minor issues in the image previously:

- Brace expansion isn't quoted, so it properly expands.
- Archive files are downloaded to the temp directory, and deleted with
  the image.

Co-authored-by: Alex Huszagh <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants