Skip to content

Commit

Permalink
Fix windows builds crashing
Browse files Browse the repository at this point in the history
  • Loading branch information
DSchroer committed Mar 9, 2023
1 parent c277e78 commit 0acb384
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 13 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Use system UI scale factor
- Use Create, Modify and Remove events for file watcher
- Order of operations
- Windows builds crashing randomly

## [v0.0.1] - 2023-02-10

Expand Down
2 changes: 0 additions & 2 deletions Cross.toml

This file was deleted.

14 changes: 3 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian
FROM debian:unstable-slim
RUN apt-get update; apt-get install -y \
clang \
cmake \
Expand All @@ -22,11 +22,8 @@ RUN apt-get update; apt-get install -y \
gnupg2 \
apt-transport-https \
ca-certificates \
software-properties-common

RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
RUN apt-get update; apt-get install -y docker-ce
software-properties-common \
bash

# OSXCross for Mac Builds
RUN git clone https://github.com/tpoechtrager/osxcross
Expand All @@ -40,11 +37,6 @@ RUN ln -s /osxcross/target/bin/x86_64-apple-darwin20.4-ld /osxcross/target/bin/x
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y
ENV PATH="/root/.cargo/bin:${PATH}"

# Cross
RUN cargo install cross --git https://github.com/cross-rs/cross
ENV CROSS_CONTAINER_IN_CONTAINER=true
ENV CROSS_CONTAINER_ENGINE_NO_BUILDKIT=1

# Toolchains
RUN rustup toolchain install nightly
RUN rustup target add x86_64-pc-windows-gnu
Expand Down

0 comments on commit 0acb384

Please sign in to comment.