mirror of
				https://github.com/nitnelave/lldap.git
				synced 2023-04-12 14:25:13 +00:00 
			
		
		
		
	docker: update Rust to v1.65.0
This commit is contained in:
		
							parent
							
								
									a4408cfacc
								
							
						
					
					
						commit
						b66e993f57
					
				
							
								
								
									
										2
									
								
								.github/workflows/Dockerfile.dev
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/Dockerfile.dev
									
									
									
									
										vendored
									
									
								
							@ -1,4 +1,4 @@
 | 
				
			|||||||
FROM rust:1.62-slim-bullseye
 | 
					FROM rust:1.65-slim-bullseye
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Set needed env path
 | 
					# 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"
 | 
					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"
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										18
									
								
								.github/workflows/docker-build-static.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								.github/workflows/docker-build-static.yml
									
									
									
									
										vendored
									
									
								
							@ -19,7 +19,7 @@ on:
 | 
				
			|||||||
env:
 | 
					env:
 | 
				
			||||||
  CARGO_TERM_COLOR: always
 | 
					  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
 | 
					# build-ui , create/compile the web
 | 
				
			||||||
@ -32,8 +32,8 @@ env:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# builds-armhf, build-aarch64, build-amd64 create binary for respective arch
 | 
					# builds-armhf, build-aarch64, build-amd64 create binary for respective arch
 | 
				
			||||||
## Use rustlang/rust:nightly image
 | 
					## Use rustlang/rust:nightly image
 | 
				
			||||||
### Add non native architecture dpkg --add-architecture XXX
 | 
					### Add non-native architecture dpkg --add-architecture XXX
 | 
				
			||||||
### Install dev tool gcc g++, etc per respective arch
 | 
					### Install dev tool gcc g++, etc. per respective arch
 | 
				
			||||||
### Cargo build
 | 
					### Cargo build
 | 
				
			||||||
### Upload artifacts
 | 
					### Upload artifacts
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -55,7 +55,7 @@ jobs:
 | 
				
			|||||||
  build-ui:
 | 
					  build-ui:
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
    container:
 | 
					    container:
 | 
				
			||||||
      image: rust:1.62
 | 
					      image: rust:1.65
 | 
				
			||||||
      env:
 | 
					      env:
 | 
				
			||||||
        CARGO_TERM_COLOR: always
 | 
					        CARGO_TERM_COLOR: always
 | 
				
			||||||
        RUSTFLAGS: -Ctarget-feature=+crt-static
 | 
					        RUSTFLAGS: -Ctarget-feature=+crt-static
 | 
				
			||||||
@ -100,7 +100,7 @@ jobs:
 | 
				
			|||||||
  build-armhf:
 | 
					  build-armhf:
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
    container:
 | 
					    container:
 | 
				
			||||||
      image: rust:1.62
 | 
					      image: rust:1.65
 | 
				
			||||||
      env:
 | 
					      env:
 | 
				
			||||||
        CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc
 | 
					        CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc
 | 
				
			||||||
        CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER: arm-linux-gnueabihf-ld
 | 
					        CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER: arm-linux-gnueabihf-ld
 | 
				
			||||||
@ -151,11 +151,11 @@ jobs:
 | 
				
			|||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
    container:
 | 
					    container:
 | 
				
			||||||
##################################################################################
 | 
					##################################################################################
 | 
				
			||||||
# Github actions currently timeout when downloading musl-gcc                     #
 | 
					# GitHub actions currently timeout when downloading musl-gcc                     #
 | 
				
			||||||
# Using lldap dev image based on rust:1.62-slim-bullseye and musl-gcc bundled    #
 | 
					# Using lldap dev image based on rust:1.65-slim-bullseye and musl-gcc bundled    #
 | 
				
			||||||
# Only for Job build aarch64 and amd64                                           #
 | 
					# Only for Job build aarch64 and amd64                                           #
 | 
				
			||||||
###################################################################################
 | 
					###################################################################################
 | 
				
			||||||
      #image: rust:1.62
 | 
					      #image: rust:1.65
 | 
				
			||||||
      image: nitnelave/rust-dev:latest
 | 
					      image: nitnelave/rust-dev:latest
 | 
				
			||||||
      env:
 | 
					      env:
 | 
				
			||||||
        CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-musl-gcc
 | 
					        CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-musl-gcc
 | 
				
			||||||
@ -205,7 +205,7 @@ jobs:
 | 
				
			|||||||
  build-amd64:
 | 
					  build-amd64:
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
    container:
 | 
					    container:
 | 
				
			||||||
#      image: rust:1.62
 | 
					#      image: rust:1.65
 | 
				
			||||||
      image: nitnelave/rust-dev:latest
 | 
					      image: nitnelave/rust-dev:latest
 | 
				
			||||||
      env:
 | 
					      env:
 | 
				
			||||||
        CARGO_TERM_COLOR: always
 | 
					        CARGO_TERM_COLOR: always
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user