From a3a27f004906c822d0313dbac8c5db0a7680b543 Mon Sep 17 00:00:00 2001 From: Waldemar Heinze <1307809+wheinze@users.noreply.github.com> Date: Fri, 25 Nov 2022 10:07:50 +0100 Subject: [PATCH] docker: update Rust to v1.65.0 --- .github/workflows/Dockerfile.dev | 2 +- .github/workflows/docker-build-static.yml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/Dockerfile.dev b/.github/workflows/Dockerfile.dev index a52323d..bb88144 100644 --- a/.github/workflows/Dockerfile.dev +++ b/.github/workflows/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM rust:1.62-slim-bullseye +FROM rust:1.65-slim-bullseye # Set needed env path ENV PATH="/opt/aarch64-linux-musl-cross/:/opt/aarch64-linux-musl-cross/bin/:/opt/x86_64-linux-musl-cross/:/opt/x86_64-linux-musl-cross/bin/:$PATH" diff --git a/.github/workflows/docker-build-static.yml b/.github/workflows/docker-build-static.yml index 02884c1..ab0476c 100644 --- a/.github/workflows/docker-build-static.yml +++ b/.github/workflows/docker-build-static.yml @@ -19,7 +19,7 @@ on: env: CARGO_TERM_COLOR: always -# In total 5 jobs, all of the jobs are containerized +# In total 5 jobs, all the jobs are containerized # --- # build-ui , create/compile the web @@ -32,8 +32,8 @@ env: # builds-armhf, build-aarch64, build-amd64 create binary for respective arch ## Use rustlang/rust:nightly image -### Add non native architecture dpkg --add-architecture XXX -### Install dev tool gcc g++, etc per respective arch +### Add non-native architecture dpkg --add-architecture XXX +### Install dev tool gcc g++, etc. per respective arch ### Cargo build ### Upload artifacts @@ -55,7 +55,7 @@ jobs: build-ui: runs-on: ubuntu-latest container: - image: rust:1.62 + image: rust:1.65 env: CARGO_TERM_COLOR: always RUSTFLAGS: -Ctarget-feature=+crt-static @@ -100,7 +100,7 @@ jobs: build-armhf: runs-on: ubuntu-latest container: - image: rust:1.62 + image: rust:1.65 env: CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER: arm-linux-gnueabihf-ld @@ -151,11 +151,11 @@ jobs: runs-on: ubuntu-latest container: ################################################################################## -# Github actions currently timeout when downloading musl-gcc # -# Using lldap dev image based on rust:1.62-slim-bullseye and musl-gcc bundled # +# GitHub actions currently timeout when downloading musl-gcc # +# Using lldap dev image based on rust:1.65-slim-bullseye and musl-gcc bundled # # Only for Job build aarch64 and amd64 # ################################################################################### - #image: rust:1.62 + #image: rust:1.65 image: nitnelave/rust-dev:latest env: CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-musl-gcc @@ -205,7 +205,7 @@ jobs: build-amd64: runs-on: ubuntu-latest container: -# image: rust:1.62 +# image: rust:1.65 image: nitnelave/rust-dev:latest env: CARGO_TERM_COLOR: always @@ -482,4 +482,4 @@ jobs: bin/amd64-bin/migration-tool-amd64, web.zip" env: - GITHUB_TOKEN: ${{ github.token }} \ No newline at end of file + GITHUB_TOKEN: ${{ github.token }}