Merge branch 'qmk:main' into main
This commit is contained in:
		
						commit
						f9636dc2b1
					
				
					 3 changed files with 6 additions and 4 deletions
				
			
		
							
								
								
									
										2
									
								
								.clangd
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								.clangd
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
CompileFlags:
 | 
			
		||||
  Add: [-Wno-unknown-attributes, -Wno-maybe-uninitialized, -Wno-unknown-warning-option]
 | 
			
		||||
  Remove: [-W*, -mcall-prologues]
 | 
			
		||||
  Remove: [-W*, -mmcu=*, -mcpu=*, -mfpu=*, -mfloat-abi=*, -mno-unaligned-access, -mno-thumb-interwork, -mcall-prologues]
 | 
			
		||||
  Compiler: clang
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,7 +17,7 @@
 | 
			
		|||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    },
 | 
			
		||||
    "postCreateCommand": "/workspaces/qmk_userspace/.devcontainer/setup.sh"
 | 
			
		||||
    "postCreateCommand": "${containerWorkspaceFolder}/.devcontainer/setup.sh ${containerWorkspaceFolder}"
 | 
			
		||||
 | 
			
		||||
    // Features to add to the dev container. More info: https://containers.dev/features.
 | 
			
		||||
    // "features": {},
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,13 +9,15 @@ rm get-pip.py
 | 
			
		|||
 | 
			
		||||
python3 -m pip install --upgrade milc
 | 
			
		||||
 | 
			
		||||
git config --global --add safe.directory /workspaces/qmk_userspace
 | 
			
		||||
userspacePath="$1"
 | 
			
		||||
 | 
			
		||||
git config --global --add safe.directory "$userspacePath"
 | 
			
		||||
git submodule update --init --recursive
 | 
			
		||||
 | 
			
		||||
[ -d /workspaces/qmk_firmware ] || git clone https://github.com/qmk/qmk_firmware.git /workspaces/qmk_firmware
 | 
			
		||||
git config --global --add safe.directory /workspaces/qmk_firmware
 | 
			
		||||
 | 
			
		||||
qmk config user.qmk_home=/workspaces/qmk_firmware
 | 
			
		||||
qmk config user.overlay_dir=/workspaces/qmk_userspace
 | 
			
		||||
qmk config user.overlay_dir="$userspacePath"
 | 
			
		||||
 | 
			
		||||
qmk git-submodule
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue