Skip to content

Commit

Permalink
Merge pull request #2408 from newsboat/feature/ci-bump-rust
Browse files Browse the repository at this point in the history
CI: bump Rust to 1.69.0
  • Loading branch information
Minoru committed Apr 25, 2023
2 parents 7299d6b + e39210b commit 4c0fcc3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions docker/ubuntu_18.04-build-tools.dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# All the programs and libraries necessary to build Newsboat. Contains GCC 8
# and Rust 1.68.2 by default.
# and Rust 1.69.0 by default.
#
# Configurable via build-args:
#
# - cxx_package -- additional Ubuntu packages to install. Default: g++-8
# - rust_version -- Rust version to install. Default: 1.68.2
# - rust_version -- Rust version to install. Default: 1.69.0
# - cc -- C compiler to use. This gets copied into CC environment variable.
# Default: gcc-8
# - cxx -- C++ compiler to use. This gets copied into CXX environment variable.
Expand Down Expand Up @@ -91,7 +91,7 @@ ENV LC_ALL en_US.UTF-8
USER builder
WORKDIR /home/builder/src

ARG rust_version=1.68.2
ARG rust_version=1.69.0

RUN wget -O $HOME/rustup.sh --secure-protocol=TLSv1_2 https://sh.rustup.rs \
&& chmod +x $HOME/rustup.sh \
Expand Down
2 changes: 1 addition & 1 deletion docker/ubuntu_18.04-i686.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ RUN wget -O $HOME/rustup.sh --secure-protocol=TLSv1_2 https://sh.rustup.rs \
&& chmod +x $HOME/rustup.sh \
&& $HOME/rustup.sh -y \
--default-host i686-unknown-linux-gnu \
--default-toolchain 1.68.2 \
--default-toolchain 1.69.0 \
&& chmod a+w $HOME/.cargo

ENV HOME /home/builder
6 changes: 3 additions & 3 deletions docker/ubuntu_20.04-build-tools.dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# All the programs and libraries necessary to build Newsboat with newer
# compilers. Contains GCC 9 and Rust 1.68.2 by default.
# compilers. Contains GCC 9 and Rust 1.69.0 by default.
#
# Configurable via build-args:
#
# - cxx_package -- additional Ubuntu packages to install. Default: g++-9
# - rust_version -- Rust version to install. Default: 1.68.2
# - rust_version -- Rust version to install. Default: 1.69.0
# - cc -- C compiler to use. This gets copied into CC environment variable.
# Default: gcc-9
# - cxx -- C++ compiler to use. This gets copied into CXX environment variable.
Expand Down Expand Up @@ -91,7 +91,7 @@ ENV LC_ALL en_US.UTF-8
USER builder
WORKDIR /home/builder/src

ARG rust_version=1.68.2
ARG rust_version=1.69.0

RUN wget -O $HOME/rustup.sh --secure-protocol=TLSv1_2 https://sh.rustup.rs \
&& chmod +x $HOME/rustup.sh \
Expand Down
6 changes: 3 additions & 3 deletions docker/ubuntu_22.04-build-tools.dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# All the programs and libraries necessary to build Newsboat with newer
# compilers. Contains GCC 12 and Rust 1.68.2 by default.
# compilers. Contains GCC 12 and Rust 1.69.0 by default.
#
# Configurable via build-args:
#
# - cxx_package -- additional Ubuntu packages to install. Default: g++-12
# - rust_version -- Rust version to install. Default: 1.68.2
# - rust_version -- Rust version to install. Default: 1.69.0
# - cc -- C compiler to use. This gets copied into CC environment variable.
# Default: gcc-12
# - cxx -- C++ compiler to use. This gets copied into CXX environment variable.
Expand Down Expand Up @@ -92,7 +92,7 @@ ENV LC_ALL en_US.UTF-8
USER builder
WORKDIR /home/builder/src

ARG rust_version=1.68.2
ARG rust_version=1.69.0

RUN wget -O $HOME/rustup.sh --secure-protocol=TLSv1_2 https://sh.rustup.rs \
&& chmod +x $HOME/rustup.sh \
Expand Down

0 comments on commit 4c0fcc3

Please sign in to comment.