Skip to content

Commit 296f685

Browse files
committed
Update to 4.4.1 stable
1 parent 8922919 commit 296f685

4 files changed

Lines changed: 5 additions & 3 deletions

File tree

misc/act-docker/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
FROM archlinux:base-devel AS base
22
ENV CI=true
33
ENV GODOT4_BIN=/usr/bin/godot
4+
ARG GODOT_RELEASE=4.4.1.stable
5+
ENV GODOT_RELEASE=${GODOT_RELEASE}
46
RUN pacman -Syu --noconfirm git flatpak fontconfig p7zip rustup vim
57
RUN rustup default stable
68
#RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
@@ -11,14 +13,14 @@ RUN rustup default stable
1113
# because we need 4.4 to stop a terrible Linux bug in Godot,
1214
# and download times from tuxfamily are quite slow.
1315
# TODO: Switch to fetching from github once 4.4 is officially released
14-
RUN mkdir -p /root/.local/share/godot/export_templates/4.4.beta/
16+
RUN mkdir -p /root/.local/share/godot/export_templates/$GODOT_RELEASE/
1517
RUN mkdir -p /tmp/godot_extraction
1618
COPY godot_binary.7z linux_release.7z /tmp/godot_extraction/
1719
WORKDIR /tmp/godot_extraction
1820
RUN 7z x godot_binary.7z
1921
RUN 7z x linux_release.7z
2022
RUN cp godot /usr/bin/godot
21-
WORKDIR /root/.local/share/godot/export_templates/4.4.beta/
23+
WORKDIR /root/.local/share/godot/export_templates/${GODOT_RELEASE}/
2224
RUN cp /tmp/godot_extraction/linux_release.x86_64 linux_release.x86_64
2325
WORKDIR /
2426
RUN rm -r /tmp/godot_extraction

misc/act-docker/godot_binary.7z

8.99 MB
Binary file not shown.

misc/act-docker/linux_release.7z

3.03 MB
Binary file not shown.

scripts/build_local_docker_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cd "$(dirname "$0")"/../misc/act-docker
77
# To avoid needing sudo to run docker commands, run this and then log out and back in:
88
# sudo usermod -aG docker $USER
99

10-
systemctl status docker || systemctl start docker
10+
systemctl status docker --no-pager || systemctl start docker
1111

1212
# To install buildx on Arch:
1313
# sudo pacman -S docker-buildx

0 commit comments

Comments
 (0)