Skip to content
Snippets Groups Projects
Verified Commit d1a9f2bb authored by Louis's avatar Louis :fire:
Browse files

Update to rust 1.80.0

parent 56b860d0
Branches 1.80.0-stable
No related tags found
No related merge requests found
Pipeline #608 canceled with stage
in 6 minutes and 14 seconds
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/bevy-builder.iml" filepath="$PROJECT_DIR$/.idea/bevy-builder.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
## This file can be used to build arm64 Linux versions of a Bevy project ## This file can be used to build arm64 Linux versions of a Bevy project
FROM r.lcr.gr/microhacks/msdfgen-builder:arm64 AS msdfgen FROM r.lcr.gr/microhacks/msdfgen-builder:arm64 AS msdfgen
FROM rust:1.78.0-slim FROM rust:1.80.0-slim
COPY --from=msdfgen /usr/bin/msdf-atlas-gen /usr/bin/msdf-atlas-gen COPY --from=msdfgen /usr/bin/msdf-atlas-gen /usr/bin/msdf-atlas-gen
...@@ -27,6 +27,7 @@ RUN apt-get update -yqq && \ ...@@ -27,6 +27,7 @@ RUN apt-get update -yqq && \
librsvg2-dev \ librsvg2-dev \
git \ git \
git-lfs \ git-lfs \
jq \
zip zip
RUN wget https://lab.lcr.gr/microhacks/crunch/-/jobs/artifacts/trunk/raw/target/release/crunch?job=build-arm64 && \ RUN wget https://lab.lcr.gr/microhacks/crunch/-/jobs/artifacts/trunk/raw/target/release/crunch?job=build-arm64 && \
......
## This file can be used to build x86 Linux, x86 Windows and Wasm versions of a Bevy project ## This file can be used to build x86 Linux, x86 Windows and Wasm versions of a Bevy project
FROM r.lcr.gr/microhacks/msdfgen-builder:latest AS msdfgen FROM r.lcr.gr/microhacks/msdfgen-builder:latest AS msdfgen
FROM rust:1.78.0-slim AS trunkbuild FROM rust:1.80-slim AS trunkbuild
RUN cargo install --locked trunk && \ RUN cargo install --locked trunk && \
rm -rf ~/.cargo/registry/{cache,src} rm -rf ~/.cargo/registry/{cache,src}
FROM rust:1.78.0-slim FROM rust:1.80.0-slim
COPY --from=msdfgen /usr/bin/msdf-atlas-gen /usr/bin/msdf-atlas-gen COPY --from=msdfgen /usr/bin/msdf-atlas-gen /usr/bin/msdf-atlas-gen
...@@ -32,6 +32,7 @@ RUN apt-get update -yqq && \ ...@@ -32,6 +32,7 @@ RUN apt-get update -yqq && \
git \ git \
git-lfs \ git-lfs \
zip \ zip \
jq \
g++-mingw-w64-x86-64 g++-mingw-w64-x86-64
RUN rustup target add x86_64-pc-windows-gnu RUN rustup target add x86_64-pc-windows-gnu
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment