Merge pull request #12 from qmk/main

Merging in updates from qmk/qmk_userspace
This commit is contained in:
Victor 2024-06-05 22:43:08 -05:00 committed by GitHub
commit b83861e903
Failed to generate hash of commit
3 changed files with 6 additions and 4 deletions

View file

@ -1,4 +1,4 @@
CompileFlags: CompileFlags:
Add: [-Wno-unknown-attributes, -Wno-maybe-uninitialized, -Wno-unknown-warning-option] 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 Compiler: clang

View file

@ -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 to add to the dev container. More info: https://containers.dev/features.
// "features": {}, // "features": {},

View file

@ -9,13 +9,15 @@ rm get-pip.py
python3 -m pip install --upgrade milc 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 git submodule update --init --recursive
[ -d /workspaces/qmk_firmware ] || git clone https://github.com/qmk/qmk_firmware.git /workspaces/qmk_firmware [ -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 git config --global --add safe.directory /workspaces/qmk_firmware
qmk config user.qmk_home=/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 qmk git-submodule