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
2 changes: 1 addition & 1 deletion .SRCINFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgbase = coolerdash
pkgdesc = Monitor telemetry data on an AIO liquid cooler with an integrated LCD display
pkgver = 2.2.0
pkgver = 2.2.2
pkgrel = 1
url = https://github.com/damachine/coolerdash
install = coolerdash.install
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/gitlab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ jobs:
sync:
name: Synchronize with GitLab
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 0 # Fetch complete history for proper sync

- name: Configure Git
run: |
git config --global user.name "GitHub Actions"
git config --global user.email "actions@github.com"

- name: Add GitLab remote and selective sync
env:
GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
Expand All @@ -35,15 +35,15 @@ jobs:
echo "Please add your GitLab Personal Access Token to GitHub Secrets as 'GITLAB_TOKEN'"
exit 1
fi

# Add GitLab remote with token authentication
git remote add gitlab https://oauth2:${GITLAB_TOKEN}@gitlab.com/damachine/coolerdash.git

echo "🔄 Creating selective sync (with GitLab-specific README)..."

# Create temporary branch for selective sync
git checkout -b gitlab-sync

# Create GitLab-specific README.md
cat > README.md << 'EOF'
# CoolerDash - GitLab Mirror
Expand All @@ -52,7 +52,7 @@ jobs:

## 📍 Main Repository

**Primary development happens on GitHub:**
**Primary development happens on GitHub:**
🔗 **[https://github.com/damachine/coolerdash](https://github.com/damachine/coolerdash)**

## 🔄 Synchronization Info
Expand All @@ -73,7 +73,7 @@ jobs:
**CoolerDash** is a real-time sensor monitoring tool for AIO liquid coolers with integrated LCD displays.

- Enhances your liquid-cooling display with extra features
- Support for additional sensor values
- Support for additional sensor values
- Polished, customizable LCD dashboard
- Add-on wrapper for [CoolerControl](https://gitlab.com/coolercontrol/coolercontrol)

Expand All @@ -85,31 +85,31 @@ jobs:

---

**🔗 Visit the main repository for the latest updates and full documentation:**
**🔗 Visit the main repository for the latest updates and full documentation:**
**[github.com/damachine/coolerdash](https://github.com/damachine/coolerdash)**
EOF

# Stage and commit the new README
git add README.md
git commit -m "INFO: this is a GitLab mirror - see GitHub for main repo: https://github.com/damachine/coolerdash"

echo "🔄 Synchronizing to GitLab (with GitLab README)..."
# Try normal push first, fallback to sync branch if main is protected
if ! git push gitlab gitlab-sync:main --force; then
echo "⚠️ Main branch is protected, creating github-sync branch instead..."
git push gitlab gitlab-sync:github-sync --force
echo "📝 Created 'github-sync' branch on GitLab"
fi

# Clean up temporary branch
git checkout main
git checkout master
git branch -D gitlab-sync

echo "🏷️ Synchronizing tags to GitLab..."
git push gitlab --tags --force

echo "✅ Synchronization completed (GitLab README created)"

- name: Create sync summary
if: success()
run: |
Expand All @@ -124,7 +124,7 @@ jobs:
echo "" >> $GITHUB_STEP_SUMMARY
echo "📝 **Note**: GitLab README explains this is a mirror and directs users to GitHub" >> $GITHUB_STEP_SUMMARY
echo "🎯 **GitLab repository is now synchronized with GitHub (selective sync)**" >> $GITHUB_STEP_SUMMARY

- name: Error summary
if: failure()
run: |
Expand All @@ -134,4 +134,4 @@ jobs:
echo "1. **Check GitLab Token**: Ensure GITLAB_TOKEN secret is set" >> $GITHUB_STEP_SUMMARY
echo "2. **Token Permissions**: Token needs 'write_repository' scope" >> $GITHUB_STEP_SUMMARY
echo "3. **Repository Access**: Verify you have push access to GitLab repo" >> $GITHUB_STEP_SUMMARY
echo "4. **Protected Branches**: Check GitLab repository branch protection settings" >> $GITHUB_STEP_SUMMARY
echo "4. **Protected Branches**: Check GitLab repository branch protection settings" >> $GITHUB_STEP_SUMMARY
94 changes: 82 additions & 12 deletions .github/workflows/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
push:
paths:
- "VERSION"
branches:
- master
workflow_dispatch:

permissions:
Expand Down Expand Up @@ -92,10 +90,10 @@ jobs:
echo "📁 Checking installed files:"
find /tmp/install-test -type f -name "*coolerdash*" | head -10

# Check binary (Plugin mode: /etc/coolercontrol/plugins/coolerdash/)
if [ -f "/tmp/install-test/etc/coolercontrol/plugins/coolerdash/coolerdash" ]; then
echo "✅ Binary installed correctly (plugin mode)"
file /tmp/install-test/etc/coolercontrol/plugins/coolerdash/coolerdash
# Check binary
if [ -f "/tmp/install-test/usr/libexec/coolerdash/coolerdash" ]; then
echo "✅ Binary installed correctly"
file /tmp/install-test/usr/libexec/coolerdash/coolerdash
else
echo "❌ Binary not found at expected location"
find /tmp/install-test -name "coolerdash" -type f
Expand Down Expand Up @@ -157,6 +155,38 @@ jobs:
echo "⚠️ Manual page not found"
fi

# Check systemd helperd service
if [ -f "/tmp/install-test/usr/lib/systemd/system/coolerdash-helperd.service" ]; then
echo "✅ Systemd helperd service installed"
else
echo "❌ Systemd helperd service not found"
exit 1
fi

# Check systemd startup-delay drop-in
if [ -f "/tmp/install-test/etc/systemd/system/cc-plugin-coolerdash.service.d/startup-delay.conf" ]; then
echo "✅ Systemd startup-delay drop-in installed"
else
echo "❌ Systemd startup-delay drop-in not found"
exit 1
fi

# Check udev rules
if [ -f "/tmp/install-test/usr/lib/udev/rules.d/99-coolerdash.rules" ]; then
echo "✅ Udev rules installed"
else
echo "❌ Udev rules not found"
exit 1
fi

# Check license file (Linux packaging standard)
if [ -f "/tmp/install-test/usr/share/licenses/coolerdash/LICENSE" ]; then
echo "✅ License file installed (/usr/share/licenses/)"
else
echo "❌ License file not found at /usr/share/licenses/coolerdash/"
exit 1
fi

echo "✅ Installation test completed on ${{ matrix.name }}"

# Additional test for Arch Linux (your development system)
Expand All @@ -174,7 +204,7 @@ jobs:
- name: Setup Arch Linux
run: |
pacman -Syu --noconfirm
pacman -S --noconfirm cairo libcurl-gnutls libinih gcc make pkg-config jansson ttf-roboto sudo systemd
pacman -S --noconfirm cairo libcurl-gnutls gcc make pkg-config jansson ttf-roboto sudo systemd file

- name: Test make install on Arch
run: |
Expand All @@ -184,16 +214,56 @@ jobs:
mkdir -p /tmp/install-test
SUDO="" REALOS=no make install DESTDIR=/tmp/install-test

# Verify plugin installation
if [ -f "/tmp/install-test/etc/coolercontrol/plugins/coolerdash/coolerdash" ]; then
echo "✅ Plugin binary installed"
file /tmp/install-test/etc/coolercontrol/plugins/coolerdash/coolerdash
# Verify binary installation
if [ -f "/tmp/install-test/usr/libexec/coolerdash/coolerdash" ]; then
echo "✅ Binary installed"
file /tmp/install-test/usr/libexec/coolerdash/coolerdash
else
echo "❌ Plugin binary not found"
echo "❌ Binary not found"
find /tmp/install-test -name "coolerdash" -type f
exit 1
fi

# Check plugin config
if [ -f "/tmp/install-test/etc/coolercontrol/plugins/coolerdash/config.json" ]; then
echo "✅ Config file installed"
else
echo "❌ Config file not found"
exit 1
fi

# Check systemd helperd service
if [ -f "/tmp/install-test/usr/lib/systemd/system/coolerdash-helperd.service" ]; then
echo "✅ Systemd helperd service installed"
else
echo "❌ Systemd helperd service not found"
exit 1
fi

# Check systemd startup-delay drop-in
if [ -f "/tmp/install-test/etc/systemd/system/cc-plugin-coolerdash.service.d/startup-delay.conf" ]; then
echo "✅ Systemd startup-delay drop-in installed"
else
echo "❌ Systemd startup-delay drop-in not found"
exit 1
fi

# Check udev rules
if [ -f "/tmp/install-test/usr/lib/udev/rules.d/99-coolerdash.rules" ]; then
echo "✅ Udev rules installed"
else
echo "❌ Udev rules not found"
exit 1
fi

# Check license file (Arch packaging guideline)
if [ -f "/tmp/install-test/usr/share/licenses/coolerdash/LICENSE" ]; then
echo "✅ License file installed (/usr/share/licenses/)"
else
echo "❌ License file not found at /usr/share/licenses/coolerdash/"
exit 1
fi

echo "✅ Arch Linux installation test completed (reference)"

# Summary report
Expand Down
Loading