converge: auto-commit at 2026-05-15 09:14:48 from zendo.brechtel
Build / build (push) Successful in 1m25s
Build / build (push) Successful in 1m25s
This commit is contained in:
+11
-11
@@ -45,7 +45,8 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
# Build the package inside an Arch Linux container.
|
# Build the package inside an Arch Linux container.
|
||||||
# Pipe workspace via stdin to avoid Docker-in-Docker volume mount issues.
|
# Pipe workspace via stdin to avoid Docker-in-Docker volume mount issues.
|
||||||
# Output package via stdout as a tar to avoid capture conflicts.
|
# All build output goes to stderr (visible in logs); only the package
|
||||||
|
# tar goes to stdout so it can be captured cleanly.
|
||||||
tar cf - --exclude=.stack-root --exclude=.stack-work . | \
|
tar cf - --exclude=.stack-root --exclude=.stack-work . | \
|
||||||
docker run --rm -i -w /build archlinux:latest bash -c "
|
docker run --rm -i -w /build archlinux:latest bash -c "
|
||||||
mkdir -p /build &&
|
mkdir -p /build &&
|
||||||
@@ -57,7 +58,7 @@ jobs:
|
|||||||
chown -R build:build . &&
|
chown -R build:build . &&
|
||||||
runuser -u build -- makepkg --noconfirm --nodeps --nocheck >&2 &&
|
runuser -u build -- makepkg --noconfirm --nodeps --nocheck >&2 &&
|
||||||
tar cf /dev/stdout converge-*.pkg.tar.zst
|
tar cf /dev/stdout converge-*.pkg.tar.zst
|
||||||
" > /tmp/packages.tar 2>/dev/null
|
" > /tmp/packages.tar
|
||||||
tar xf /tmp/packages.tar
|
tar xf /tmp/packages.tar
|
||||||
echo "pkgfile=$(ls converge-[0-9]*.pkg.tar.zst)" >> "$GITHUB_ENV"
|
echo "pkgfile=$(ls converge-[0-9]*.pkg.tar.zst)" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
@@ -66,26 +67,25 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
SSH_AUTH_SOCK: /dev/null
|
SSH_AUTH_SOCK: /dev/null
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
# Set up SSH
|
# Set up SSH
|
||||||
mkdir -p "$HOME/.ssh"
|
mkdir -p "$HOME/.ssh"
|
||||||
echo "${{ secrets.ARCH_REPO_SSH_KEY }}" > "$HOME/.ssh/id_ed25519"
|
echo "${{ secrets.ARCH_REPO_SSH_KEY }}" > "$HOME/.ssh/id_ed25519"
|
||||||
chmod 600 "$HOME/.ssh/id_ed25519"
|
chmod 600 "$HOME/.ssh/id_ed25519"
|
||||||
ssh-keyscan -H "${{ secrets.ARCH_REPO_HOST }}" >> "$HOME/.ssh/known_hosts" 2>/dev/null
|
ssh-keyscan -H "${{ vars.ARCH_REPO_HOST }}" >> "$HOME/.ssh/known_hosts" 2>/dev/null
|
||||||
|
|
||||||
PKGFILE="${{ env.pkgfile }}"
|
PKGFILE="${{ env.pkgfile }}"
|
||||||
|
echo "Uploading $PKGFILE to ${{ vars.ARCH_REPO_HOST }}..."
|
||||||
|
|
||||||
# Upload the package
|
# Upload the package
|
||||||
scp -i "$HOME/.ssh/id_ed25519" \
|
scp -v -i "$HOME/.ssh/id_ed25519" \
|
||||||
"$PKGFILE" \
|
"$PKGFILE" \
|
||||||
"${{ secrets.ARCH_REPO_USER }}@${{ secrets.ARCH_REPO_HOST }}:${{ secrets.ARCH_REPO_PATH }}/"
|
"${{ vars.ARCH_REPO_USER }}@${{ vars.ARCH_REPO_HOST }}:${{ vars.ARCH_REPO_PATH }}/"
|
||||||
|
|
||||||
# Add to repo database
|
# Add to repo database
|
||||||
ssh -i "$HOME/.ssh/id_ed25519" \
|
ssh -v -i "$HOME/.ssh/id_ed25519" \
|
||||||
"${{ secrets.ARCH_REPO_USER }}@${{ secrets.ARCH_REPO_HOST }}" \
|
"${{ vars.ARCH_REPO_USER }}@${{ vars.ARCH_REPO_HOST }}" \
|
||||||
"cd '${{ secrets.ARCH_REPO_PATH }}' && \
|
"cd '${{ vars.ARCH_REPO_PATH }}' && \
|
||||||
repo-add '${{ secrets.ARCH_REPO_DB }}' '$PKGFILE' && \
|
repo-add '${{ vars.ARCH_REPO_DB }}' '$PKGFILE' && \
|
||||||
rm -f '$PKGFILE.old'"
|
rm -f '$PKGFILE.old'"
|
||||||
|
|
||||||
- name: Upload artifact
|
- name: Upload artifact
|
||||||
|
|||||||
Reference in New Issue
Block a user