+
+ {% if binaries | length > 0 %}
+
+ {% endif %}
+
+
+
diff --git a/util/docker_build.sh b/util/docker_build.sh
index 828b5751af5..2234fc96f67 100755
--- a/util/docker_build.sh
+++ b/util/docker_build.sh
@@ -1,85 +1,3 @@
#!/bin/sh
-# NOTE: This script uses tabs for indentation
-errcho() {
- echo "$@" >&2
-}
-
-USAGE="Usage: $0 [keyboard[:keymap[:target]]]"
-
-# Check preconditions
-for arg; do
- if [ "$arg" = "--help" ]; then
- echo "$USAGE"
- exit 0
- fi
-done
-if [ $# -gt 1 ]; then
- errcho "$USAGE"
- exit 1
-fi
-
-# Allow $RUNTIME to be overridden by the user as an environment variable
-# Else check if either podman or docker exit and set them as runtime
-# if none are found error out
-if [ -z "$RUNTIME" ]; then
- if command -v podman >/dev/null 2>&1; then
- RUNTIME="podman"
- elif command -v docker >/dev/null 2>&1; then
- RUNTIME="docker"
- else
- errcho "Error: no compatible container runtime found."
- errcho "Either podman or docker are required."
- errcho "See https://podman.io/getting-started/installation"
- errcho "or https://docs.docker.com/install/#supported-platforms"
- errcho "for installation instructions."
- exit 2
- fi
-fi
-
-
-# Determine arguments
-if [ $# -eq 0 ]; then
- printf "keyboard=" && read -r keyboard
- [ -n "$keyboard" ] && printf "keymap=" && read -r keymap
- [ -n "$keymap" ] && printf "target=" && read -r target
-else
- IFS=':' read -r keyboard keymap target x <<-EOF
- $1
- EOF
- if [ -n "$x" ]; then
- errcho "$USAGE"
- exit 1
- fi
-fi
-if [ -z "$keyboard" ]; then
- keyboard=all
-fi
-if [ -n "$target" ]; then
- # IF we are using docker on non Linux and docker-machine isn't working print an error
- # ELSE set usb_args
- if [ ! "$(uname)" = "Linux" ] && [ "$RUNTIME" = "docker" ] && ! docker-machine active >/dev/null 2>&1; then
- errcho "Error: target requires docker-machine to work on your platform"
- errcho "See http://gw.tnode.com/docker/docker-machine-with-usb-support-on-windows-macos"
- errcho "Consider flashing with QMK Toolbox (https://github.com/qmk/qmk_toolbox) instead"
- exit 3
- else
- usb_args="--privileged -v /dev:/dev"
- fi
-fi
-dir=$(pwd -W 2>/dev/null) || dir=$PWD # Use Windows path if on Windows
-
-if [ "$RUNTIME" = "docker" ]; then
- uid_arg="--user $(id -u):$(id -g)"
-fi
-
-# Run container and build firmware
-"$RUNTIME" run --rm -it $usb_args \
- $uid_arg \
- -w /qmk_firmware \
- -v "$dir":/qmk_firmware \
- -e ALT_GET_KEYBOARDS=true \
- -e SKIP_GIT="$SKIP_GIT" \
- -e MAKEFLAGS="$MAKEFLAGS" \
- ghcr.io/qmk/qmk_cli \
- make "$keyboard${keymap:+:$keymap}${target:+:$target}"
+./util/docker_cmd.sh make "$@"
diff --git a/util/docker_cmd.sh b/util/docker_cmd.sh
index 4a82890603b..18725db0689 100755
--- a/util/docker_cmd.sh
+++ b/util/docker_cmd.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# vim: set ft=sh ts=4 sw=4 noexpandtab
# NOTE: This script uses tabs for indentation
errcho() {
@@ -37,13 +38,26 @@ fi
# IF we are using docker on non Linux and docker-machine isn't working print an error
# ELSE set usb_args
if [ ! "$(uname)" = "Linux" ] && [ "$RUNTIME" = "docker" ] && ! docker-machine active >/dev/null 2>&1; then
- errcho "Error: target requires docker-machine to work on your platform"
- errcho "See http://gw.tnode.com/docker/docker-machine-with-usb-support-on-windows-macos"
- exit 3
+ errcho "Error: target requires docker-machine to work on your platform"
+ errcho "See http://gw.tnode.com/docker/docker-machine-with-usb-support-on-windows-macos"
+ exit 3
else
- usb_args="--privileged -v /dev:/dev"
+ usb_args="--privileged -v /dev:/dev"
+fi
+
+qmk_firmware_dir=$(pwd -W 2>/dev/null) || qmk_firmware_dir=$PWD # Use Windows path if on Windows
+qmk_userspace_dir=""
+userspace_docker_args=""
+
+if [ -n "$QMK_USERSPACE" ] && [ -e "$QMK_USERSPACE/qmk.json" ]; then
+ qmk_userspace_dir=$(cd "$QMK_USERSPACE" && pwd -W 2>/dev/null) || qmk_userspace_dir=$QMK_USERSPACE # Use Windows path if on Windows
+elif [ -n "$(which qmk 2>/dev/null)" ] && [ -n "$(qmk userspace-path)" ]; then
+ qmk_userspace_dir=$(cd "$(qmk userspace-path)" && pwd -W 2>/dev/null) || qmk_userspace_dir=$(qmk userspace-path) # Use Windows path if on Windows
+fi
+
+if [ -n "$qmk_userspace_dir" ]; then
+ userspace_docker_args="-v $qmk_userspace_dir:/qmk_userspace:z -e QMK_USERSPACE=/qmk_userspace"
fi
-dir=$(pwd -W 2>/dev/null) || dir=$PWD # Use Windows path if on Windows
if [ "$RUNTIME" = "docker" ]; then
uid_arg="--user $(id -u):$(id -g)"
@@ -54,6 +68,10 @@ fi
$usb_args \
$uid_arg \
-w /qmk_firmware \
- -v "$dir":/qmk_firmware \
+ -v "$qmk_firmware_dir":/qmk_firmware:z \
+ $userspace_docker_args \
+ -e SKIP_GIT="$SKIP_GIT" \
+ -e SKIP_VERSION="$SKIP_VERSION" \
+ -e MAKEFLAGS="$MAKEFLAGS" \
ghcr.io/qmk/qmk_cli \
"$@"
diff --git a/util/install/fedora.sh b/util/install/fedora.sh
index d3bc90b1765..0b93326bbfc 100755
--- a/util/install/fedora.sh
+++ b/util/install/fedora.sh
@@ -4,7 +4,7 @@ _qmk_install() {
echo "Installing dependencies"
. /etc/os-release
- if [ "$VERSION_ID" == "39" ]; then
+ if [ "$VERSION_ID" -ge "39" ]; then
sudo dnf $SKIP_PROMPT copr enable erovia/dfu-programmer
fi
diff --git a/util/update_chibios_mirror.sh b/util/update_chibios_mirror.sh
index 05e22fa2eaa..ea3f2ba3547 100755
--- a/util/update_chibios_mirror.sh
+++ b/util/update_chibios_mirror.sh
@@ -4,13 +4,10 @@
# Configuration
# The ChibiOS branches to mirror
-chibios_branches="trunk stable_20.3.x stable_21.11.x"
-
-# The ChibiOS tags to mirror
-chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 ver20.3.4 ver21.11.1 ver21.11.2 ver21.11.3"
+chibios_branches="trunk stable_21.11.x"
# The ChibiOS-Contrib branches to mirror
-contrib_branches="chibios-20.3.x chibios-21.11.x"
+contrib_branches="chibios-21.11.x"
################################
# Actions
@@ -46,6 +43,12 @@ fi
echo "Updating remotes..."
git fetch --all --tags --prune
+echo "Ensure refs actually match up..."
+for branch in $chibios_branches ; do
+ echo "Matching $branch..."
+ git update-ref refs/remotes/svn/$branch refs/remotes/qmk/svn-mirror/$branch
+done
+
echo "Fetching latest from subversion..."
git svn fetch
@@ -56,13 +59,6 @@ for branch in $chibios_branches ; do
&& git push qmk svn-mirror/$branch
done
-echo "Updating ChibiOS tags..."
-for tagname in $chibios_tags ; do
- echo "Creating tag 'svn-mirror/$tagname' from 'svn/tags/$tagname'..."
- GIT_COMMITTER_DATE="$(git log -n1 --pretty=format:'%ad' svn/tags/$tagname)" git tag -f -a -m "Tagging $tagname" svn-mirror/$tagname svn/tags/$tagname
- git push qmk svn-mirror/$tagname
-done
-
cd "$contrib_dir"
if [[ -z "$(cat "$contrib_git_config" | grep '\[remote "qmk"\]')" ]] ; then
+
+
+
+ 
+
+
+
+
+
+ CI Build {% if failures | length > 0 %}❌{% else %}✅{% endif %}
+
+
+ {{ git_describe }}
+
+
+ {{ git_revision }}
+
+
+ {{ failures | length }} failure{% if failures | length != 1 %}s{% endif %}
+
+
+
+ {% if binaries | length > 0 %}Firmwares | {% endif %}
+ Commit info
+ {% if failures | length > 0 %} | Failure Logs{% endif %}
+
+
+
+
+ {% if failures | length > 0 %}
+
+ Git commit
+
+
+ {{ git_log | ansi2html }}
+
+
+ {% for failure in failures %}
+
+ Build failure logs
+-
+ {% for failure in failures %}
+
- {{ failure.keyboard }}:{{ failure.keymap }} + {% endfor %} +
+
+ {% endfor %}
+ {% endif %}
+ Build failure — {{ failure.keyboard }}:{{ failure.keymap }}
+
+
+ {{ failure.stdout | ansi2html }}
+