From d1a9f2bbd2736af51915066e82af300bb52e1c9f Mon Sep 17 00:00:00 2001
From: Louis Capitanchik <contact@louiscap.co>
Date: Sat, 31 Aug 2024 03:08:04 +0100
Subject: [PATCH] Update to rust 1.80.0
---
.idea/.gitignore | 8 ++++++++
.idea/bevy-builder.iml | 9 +++++++++
.idea/misc.xml | 6 ++++++
.idea/modules.xml | 8 ++++++++
.idea/vcs.xml | 6 ++++++
arm64.dockerfile | 3 ++-
x86.dockerfile | 5 +++--
7 files changed, 42 insertions(+), 3 deletions(-)
create mode 100644 .idea/.gitignore
create mode 100644 .idea/bevy-builder.iml
create mode 100644 .idea/misc.xml
create mode 100644 .idea/modules.xml
create mode 100644 .idea/vcs.xml
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/bevy-builder.iml b/.idea/bevy-builder.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/bevy-builder.iml
@@ -0,0 +1,9 @@
+<?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
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..e0844bc
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?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
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..3eb5c68
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?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
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?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
diff --git a/arm64.dockerfile b/arm64.dockerfile
index f356d47..21af183 100644
--- a/arm64.dockerfile
+++ b/arm64.dockerfile
@@ -1,7 +1,7 @@
## 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 rust:1.78.0-slim
+FROM rust:1.80.0-slim
COPY --from=msdfgen /usr/bin/msdf-atlas-gen /usr/bin/msdf-atlas-gen
@@ -27,6 +27,7 @@ RUN apt-get update -yqq && \
librsvg2-dev \
git \
git-lfs \
+ jq \
zip
RUN wget https://lab.lcr.gr/microhacks/crunch/-/jobs/artifacts/trunk/raw/target/release/crunch?job=build-arm64 && \
diff --git a/x86.dockerfile b/x86.dockerfile
index cb6b075..0e6166a 100644
--- a/x86.dockerfile
+++ b/x86.dockerfile
@@ -1,10 +1,10 @@
## 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 rust:1.78.0-slim AS trunkbuild
+FROM rust:1.80-slim AS trunkbuild
RUN cargo install --locked trunk && \
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
@@ -32,6 +32,7 @@ RUN apt-get update -yqq && \
git \
git-lfs \
zip \
+ jq \
g++-mingw-w64-x86-64
RUN rustup target add x86_64-pc-windows-gnu
--
GitLab