Added windows testing
continuous-integration/drone/push Build is passing Details

added static compile for windows
This commit is contained in:
Joe Bellus 2022-10-16 15:10:39 -04:00
parent be7191671e
commit ca1ca6b249
4 changed files with 19 additions and 11 deletions

4
.cargo/config Normal file
View File

@ -0,0 +1,4 @@
[target.x86_64-pc-windows-msvc]
rustflags = ["-Ctarget-feature=+crt-static"]
[target.i686-pc-windows-msvc]
rustflags = ["-Ctarget-feature=+crt-static"]

View File

@ -23,12 +23,12 @@ steps:
- chmod +x mc
- ./mc alias set fivesigma https://objects.5sigma.io $MINIOID $MINIOSECRET
- ./mc cp conductor.tar.gz fivesigma/public/abacus/conductor.tar.gz
# when:
# event:
# - promote
# target:
# - staging
# - production
when:
event:
- promote
target:
- staging
- production
---
@ -39,7 +39,11 @@ platform:
os: windows
arch: amd64
steps:
- name: build-bin-windows
- name: test
commands:
- rustup default stable
- cargo test
- name: deploy
commands:
- rustup default stable
- mc alias set fivesigma https://objects.5sigma.io $MINIOID $MINIOSECRET

View File

@ -330,5 +330,5 @@ impl EditorData {
#[cfg(test)]
mod tests {
use super::*;
// use super::*;
}

View File

@ -2,7 +2,7 @@ use abacus_core::Output;
use clipboard::ClipboardProvider;
use druid::{
piet::{CairoTextLayout, Text, TextAttribute, TextLayout, TextLayoutBuilder},
piet::{PietTextLayout, Text, TextAttribute, TextLayout, TextLayoutBuilder},
widget::{Container, Flex, Label, Padding, Svg, SvgData},
Color, Event, FontDescriptor, FontFamily, FontWeight, LifeCycle, PaintCtx, Rect, RenderContext,
Target, Widget, WidgetExt,
@ -115,7 +115,7 @@ impl Default for AbacusEditor {
}
impl AbacusEditor {
fn paint_cursor(&self, ctx: &mut PaintCtx, data: &EditorData, layout: &CairoTextLayout) {
fn paint_cursor(&self, ctx: &mut PaintCtx, data: &EditorData, layout: &PietTextLayout) {
if data.mode == EditMode::Insert {
if data.cursor_pos == 0 {
let rects = layout.rects_for_range(0..1);
@ -190,7 +190,7 @@ impl AbacusEditor {
&self,
ctx: &mut PaintCtx,
data: &EditorData,
) -> CairoTextLayout {
) -> PietTextLayout {
let syntax = self.syntax_set.find_syntax_by_extension("rs").unwrap();
let mut h = HighlightLines::new(syntax, &self.theme_set.themes["base16-mocha.dark"]);