From 98d9bc62ff9630c414bbd3c5f65cc6dbf820a8fd Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Fri, 26 Jul 2024 19:22:31 +0100 Subject: [PATCH] ci: attempt to fix deb repo processing by calling `repo-process-deb` with trusty-unstable` rather than `trusty` for unstable builds, because that seems to make sense. To make sure, both are called. Same applies to stable. --- .woodpecker/git-binary.yaml | 1 + .woodpecker/stable-binary.yaml | 1 + package-lock.json | 1 + 3 files changed, 3 insertions(+) diff --git a/.woodpecker/git-binary.yaml b/.woodpecker/git-binary.yaml index f2af709..3c4a37e 100644 --- a/.woodpecker/git-binary.yaml +++ b/.woodpecker/git-binary.yaml @@ -36,6 +36,7 @@ steps: commands: - sh -c "echo \"$REPO_SSH_ID\" > /tmp/id_repo && chmod 600 /tmp/id_repo" - bash -c 'sftp -P 2022 -i /tmp/id_repo -o StrictHostKeyChecking=no root@apt.hrfee.dev:/repo/incoming <<< $"put dist/*.deb"' + - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "repo-process-deb trusty-unstable"' - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "repo-process-deb trusty"' - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "rm -f /repo/incoming/*.deb"' - name: buildrone diff --git a/.woodpecker/stable-binary.yaml b/.woodpecker/stable-binary.yaml index 32ed7d7..c745293 100644 --- a/.woodpecker/stable-binary.yaml +++ b/.woodpecker/stable-binary.yaml @@ -21,6 +21,7 @@ steps: - sh -c "echo \"$REPO_SSH_ID\" > /tmp/id_repo && chmod 600 /tmp/id_repo" - bash -c 'sftp -P 2022 -i /tmp/id_repo -o StrictHostKeyChecking=no root@apt.hrfee.dev:/repo/incoming <<< $"put dist/*.deb"' - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "repo-process-deb trusty"' + - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "repo-process-deb trusty-unstable"' - bash -c 'ssh -i /tmp/id_repo root@apt.hrfee.dev -p 2022 "rm -f /repo/incoming/*.deb"' - name: buildrone image: docker.io/hrfee/jfa-go-build-docker:latest diff --git a/package-lock.json b/package-lock.json index 4e39d15..76613cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "any-date-parser": "^1.5.4", "browserslist": "^4.21.7", "cheerio": "^1.0.0-rc.12", + "esbuild": "^0.18.20", "fs-cheerio": "^3.0.0", "inline-source": "^8.0.2", "jsdom": "^22.1.0",