Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
mkdir -p vendor
curl --fail --silent --show-error --location \
--retry 3 --retry-delay 5 \
-H "User-Agent: xdj-clock-ci/1.0" \
-H "User-Agent: autoblink-ci/1.0" \
"https://static.crates.io/crates/rusty_link/rusty_link-$RUSTY_LINK_VERSION.crate" \
-o "$RUNNER_TEMP/rusty_link.tar.gz"
tar xzf "$RUNNER_TEMP/rusty_link.tar.gz" -C vendor
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
mkdir -p vendor
curl --fail --silent --show-error --location \
--retry 3 --retry-delay 5 \
-H "User-Agent: xdj-clock-ci/1.0" \
-H "User-Agent: autoblink-ci/1.0" \
"https://static.crates.io/crates/rusty_link/rusty_link-$RUSTY_LINK_VERSION.crate" \
-o "$RUNNER_TEMP/rusty_link.tar.gz"
tar xzf "$RUNNER_TEMP/rusty_link.tar.gz" -C vendor
Expand All @@ -103,7 +103,7 @@ jobs:
New-Item -ItemType Directory -Force vendor | Out-Null
$url = "https://static.crates.io/crates/rusty_link/rusty_link-$env:RUSTY_LINK_VERSION.crate"
$tmp = "$env:RUNNER_TEMP\rusty_link.tar.gz"
curl.exe --fail --show-error --location --retry 3 --retry-delay 5 -H "User-Agent: xdj-clock-ci/1.0" "$url" -o "$tmp"
curl.exe --fail --show-error --location --retry 3 --retry-delay 5 -H "User-Agent: autoblink-ci/1.0" "$url" -o "$tmp"
if ($LASTEXITCODE -ne 0) {
Write-Error "curl.exe failed with exit code $LASTEXITCODE"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/esp32-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: esp32-firmware
path: esp32/target/xtensa-esp32-espidf/release/xdj-clock-esp32
path: esp32/target/xtensa-esp32-espidf/release/autoblink-esp32
16 changes: 10 additions & 6 deletions .github/workflows/esp32-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ jobs:
- name: Prepare release package
run: |
mkdir -p esp32-release
elf=esp32/target/xtensa-esp32-espidf/release/xdj-clock-esp32
elf=esp32/target/xtensa-esp32-espidf/release/autoblink-esp32
cp "$elf" esp32-release/
# One image with the bootloader and the partition table. Write it at address 0x0.
espflash save-image --chip esp32 --merge \
--bootloader esp32/target/xtensa-esp32-espidf/release/bootloader.bin \
--partition-table esp32/partitions.csv \
"$elf" esp32-release/xdj-clock-esp32-merged.bin
"$elf" esp32-release/autoblink-esp32-merged.bin
# The app image without the bootloader. The box downloads it for an OTA update.
espflash save-image --chip esp32 "$elf" esp32-release/xdj-clock-esp32-ota.bin
espflash save-image --chip esp32 "$elf" esp32-release/autoblink-esp32-ota.bin
tag="${{ github.ref_name }}"
echo "${tag#esp32-v}" > esp32-release/esp32-version.txt
tar -czf esp32-firmware.tar.gz esp32-release/
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
files=$(find artifacts -type f | tr '\n' ' ')
# The host release stays the latest release of the repository.
gh release create "$tag" \
--title "xdj-clock ESP32 $tag" \
--title "AUTOBLINK ESP32 $tag" \
--notes "ESP32 firmware release" \
--latest=false \
$files
Expand All @@ -114,8 +114,12 @@ jobs:
tar -xzf artifacts/*/esp32-firmware.tar.gz
if ! gh release view esp32-latest > /dev/null 2>&1; then
gh release create esp32-latest --prerelease --latest=false \
--title "xdj-clock ESP32 OTA" \
--title "AUTOBLINK ESP32 OTA" \
--notes "The ESP32 box downloads its firmware updates from this release."
fi
# ponytail: Firmware 1.22.0 and older downloads xdj-clock-esp32-ota.bin.
# Remove this copy when all boxes have firmware 1.22.1 or newer.
cp esp32-release/autoblink-esp32-ota.bin esp32-release/xdj-clock-esp32-ota.bin
gh release upload esp32-latest --clobber \
esp32-release/esp32-version.txt esp32-release/xdj-clock-esp32-ota.bin
esp32-release/esp32-version.txt esp32-release/autoblink-esp32-ota.bin \
esp32-release/xdj-clock-esp32-ota.bin
26 changes: 13 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
mkdir -p vendor
curl --fail --silent --show-error --location \
--retry 3 --retry-delay 5 \
-H "User-Agent: xdj-clock-ci/1.0" \
-H "User-Agent: autoblink-ci/1.0" \
"https://static.crates.io/crates/rusty_link/rusty_link-$RUSTY_LINK_VERSION.crate" \
-o "$RUNNER_TEMP/rusty_link.tar.gz"
tar xzf "$RUNNER_TEMP/rusty_link.tar.gz" -C vendor
Expand Down Expand Up @@ -69,29 +69,29 @@ jobs:
# Windows x86-64 (MSVC)
- target: x86_64-pc-windows-msvc
runner: windows-latest
artifact: xdj-clock-windows-x86_64
binary: xdj-clock.exe
artifact: autoblink-windows-x86_64
binary: autoblink.exe
archive_cmd: zip

# Linux x86-64
- target: x86_64-unknown-linux-gnu
runner: ubuntu-latest
artifact: xdj-clock-linux-x86_64
binary: xdj-clock
artifact: autoblink-linux-x86_64
binary: autoblink
archive_cmd: tar

# Linux ARM64 (Raspberry Pi 3/4/5 with a 64-bit OS)
- target: aarch64-unknown-linux-gnu
runner: ubuntu-24.04-arm
artifact: xdj-clock-linux-aarch64
binary: xdj-clock
artifact: autoblink-linux-aarch64
binary: autoblink
archive_cmd: tar

# macOS Apple Silicon
- target: aarch64-apple-darwin
runner: macos-latest
artifact: xdj-clock-macos-aarch64
binary: xdj-clock
artifact: autoblink-macos-aarch64
binary: autoblink
archive_cmd: tar

steps:
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
mkdir -p vendor
curl --fail --silent --show-error --location \
--retry 3 --retry-delay 5 \
-H "User-Agent: xdj-clock-ci/1.0" \
-H "User-Agent: autoblink-ci/1.0" \
"https://static.crates.io/crates/rusty_link/rusty_link-$RUSTY_LINK_VERSION.crate" \
-o "$RUNNER_TEMP/rusty_link.tar.gz"
tar xzf "$RUNNER_TEMP/rusty_link.tar.gz" -C vendor
Expand All @@ -134,7 +134,7 @@ jobs:
New-Item -ItemType Directory -Force vendor | Out-Null
$url = "https://static.crates.io/crates/rusty_link/rusty_link-$env:RUSTY_LINK_VERSION.crate"
$tmp = "$env:RUNNER_TEMP\rusty_link.tar.gz"
curl.exe --fail --show-error --location --retry 3 --retry-delay 5 -H "User-Agent: xdj-clock-ci/1.0" "$url" -o "$tmp"
curl.exe --fail --show-error --location --retry 3 --retry-delay 5 -H "User-Agent: autoblink-ci/1.0" "$url" -o "$tmp"
if ($LASTEXITCODE -ne 0) {
Write-Error "curl.exe failed with exit code $LASTEXITCODE"
exit 1
Expand Down Expand Up @@ -219,7 +219,7 @@ jobs:
cp "target/${{ matrix.target }}/release/${{ matrix.binary }}" "$dir/"
cp config.toml "$dir/"
cp README.md "$dir/"
if [ "${{ runner.os }}" = "Linux" ]; then cp contrib/xdj-clock.service "$dir/"; fi
if [ "${{ runner.os }}" = "Linux" ]; then cp contrib/autoblink.service "$dir/"; fi
tar -czf "$dir.tar.gz" "$dir"
echo "ASSET=$dir.tar.gz" >> $GITHUB_ENV

Expand Down Expand Up @@ -255,6 +255,6 @@ jobs:
# Collect all archive files
files=$(find artifacts -type f \( -name "*.zip" -o -name "*.tar.gz" \) | tr '\n' ' ')
gh release create "$tag" \
--title "xdj-clock $tag" \
--title "AUTOBLINK $tag" \
--generate-notes \
$files
Loading
Loading