Compare commits

..

2 Commits

Author SHA1 Message Date
jbrechtel 9bca886629 converge: auto-commit at 2026-05-14 22:46:10 from zendo.brechtel
Build / build (push) Failing after 1m45s
2026-05-14 22:46:10 -04:00
jbrechtel edc6d5acf3 Ignores arch package files etc 2026-05-14 22:32:35 -04:00
6 changed files with 44 additions and 1 deletions
+38
View File
@@ -41,6 +41,44 @@ jobs:
fi
${UPX_DIR}/upx build/converge
- name: Build Arch package
run: |
# Build the package inside an Arch Linux container
# (PKGBUILD detects build/converge as pre-built binary)
docker run --rm \
-v "$PWD:$PWD" \
-w "$PWD" \
archlinux:latest \
bash -c 'pacman -Syu --noconfirm && pacman -S --noconfirm git && useradd -m build && chown -R build:build . && su build -c "makepkg --noconfirm --nodeps"'
echo "pkgfile=$(ls converge-*.pkg.tar.zst)" >> "$GITHUB_ENV"
- name: Publish to Arch repo
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
env:
SSH_AUTH_SOCK: /dev/null
run: |
set -euo pipefail
# Set up SSH
mkdir -p "$HOME/.ssh"
echo "${{ secrets.ARCH_REPO_SSH_KEY }}" > "$HOME/.ssh/id_ed25519"
chmod 600 "$HOME/.ssh/id_ed25519"
ssh-keyscan -H "${{ secrets.ARCH_REPO_HOST }}" >> "$HOME/.ssh/known_hosts" 2>/dev/null
PKGFILE="${{ env.pkgfile }}"
# Upload the package
scp -i "$HOME/.ssh/id_ed25519" \
"$PKGFILE" \
"${{ secrets.ARCH_REPO_USER }}@${{ secrets.ARCH_REPO_HOST }}:${{ secrets.ARCH_REPO_PATH }}/"
# Add to repo database
ssh -i "$HOME/.ssh/id_ed25519" \
"${{ secrets.ARCH_REPO_USER }}@${{ secrets.ARCH_REPO_HOST }}" \
"cd '${{ secrets.ARCH_REPO_PATH }}' && \
repo-add '${{ secrets.ARCH_REPO_DB }}' '$PKGFILE' && \
rm -f '$PKGFILE.old'"
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
+2
View File
@@ -12,3 +12,5 @@ dist-newstyle/
.pi/
converge-relay/.go-cache/
converge-relay/build/
*.pkg.tar
pkg/
+1
View File
@@ -24,6 +24,7 @@ md5sums=(
build() {
cd "$startdir"
echo "$startdir"
# Use pre-built binary if available (e.g. from scripts/build), otherwise build from source
if [[ -x build/converge ]]; then
+1 -1
View File
@@ -6,7 +6,7 @@ Wants=network-online.target
[Service]
Type=simple
ExecStart=%h/.local/bin/converge --config %h/.config/converge/config.yaml
ExecStart=/usr/bin/converge --config %h/.config/converge/config.yaml
Restart=on-failure
RestartSec=10
+1
View File
@@ -0,0 +1 @@
/work/personal/converge/converge.example.yaml
+1
View File
@@ -0,0 +1 @@
/work/personal/converge/converge.service