From 40b8bad6bcd669d43a7c99f79cc697c01a4056d9 Mon Sep 17 00:00:00 2001 From: Diogo Matsubara Date: Tue, 7 May 2024 12:09:07 +0200 Subject: [PATCH] Add repo as input for publish debian action (#131) * Add repo as input for publish debian action We now include the repo as part of the temporary .Packages-$repo-$version file used to generate Packages.gz for the debian repository. This way the temporary .Packages file is not overwritten per package when the action runs causing Packages.gz to be built with missing Packages. * npm run build to transpile ts to js --- .github/workflows/release-crates-debian.yml | 1 + dist/publish-crates-debian-main.js | 4 +++- publish-crates-debian/action.yml | 2 ++ src/publish-crates-debian.ts | 5 ++++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-crates-debian.yml b/.github/workflows/release-crates-debian.yml index 8fa8082..666740a 100644 --- a/.github/workflows/release-crates-debian.yml +++ b/.github/workflows/release-crates-debian.yml @@ -70,3 +70,4 @@ jobs: ssh-host-path: /home/data/httpd/download.eclipse.org/zenoh/debian-repo ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} ssh-passphrase: ${{ secrets.SSH_PASSPHRASE }} + repo: ${{ inputs.repo }} diff --git a/dist/publish-crates-debian-main.js b/dist/publish-crates-debian-main.js index 30fbdb2..c31ec75 100644 --- a/dist/publish-crates-debian-main.js +++ b/dist/publish-crates-debian-main.js @@ -127689,6 +127689,7 @@ function setup() { const sshPrivateKey = _actions_core__WEBPACK_IMPORTED_MODULE_2__.getInput("ssh-private-key", { required: true }); const sshPassphrase = _actions_core__WEBPACK_IMPORTED_MODULE_2__.getInput("ssh-passphrase", { required: true }); const installationTest = _actions_core__WEBPACK_IMPORTED_MODULE_2__.getBooleanInput("installation-test", { required: true }); + const repo = _actions_core__WEBPACK_IMPORTED_MODULE_2__.getInput("repo", { required: true }); return { liveRun, version, @@ -127697,6 +127698,7 @@ function setup() { sshPrivateKey, sshPassphrase, installationTest, + repo, }; } function gzip(input) { @@ -127722,7 +127724,7 @@ async function main(input) { } } const debianRepo = `${input.sshHost}:${input.sshHostPath}`; - const packagesPath = `.Packages-${input.version}`; + const packagesPath = `.Packages-${input.repo}-${input.version}`; const allPackagesPath = "Packages"; const allPackagesGzippedPath = "Packages.gz"; await _ssh__WEBPACK_IMPORTED_MODULE_4__/* .withIdentity */ .Y(input.sshPrivateKey, input.sshPassphrase, env => { diff --git a/publish-crates-debian/action.yml b/publish-crates-debian/action.yml index 7d395c3..af4db56 100644 --- a/publish-crates-debian/action.yml +++ b/publish-crates-debian/action.yml @@ -15,6 +15,8 @@ inputs: required: true installation-test: required: true + repo: + required: true runs: using: node20 diff --git a/src/publish-crates-debian.ts b/src/publish-crates-debian.ts index 1a89eb6..f677eab 100644 --- a/src/publish-crates-debian.ts +++ b/src/publish-crates-debian.ts @@ -23,6 +23,7 @@ export type Input = { sshPrivateKey: string; sshPassphrase: string; installationTest: boolean; + repo: string; }; export function setup(): Input { @@ -33,6 +34,7 @@ export function setup(): Input { const sshPrivateKey = core.getInput("ssh-private-key", { required: true }); const sshPassphrase = core.getInput("ssh-passphrase", { required: true }); const installationTest = core.getBooleanInput("installation-test", { required: true }); + const repo = core.getInput("repo", {required: true}); return { liveRun, @@ -42,6 +44,7 @@ export function setup(): Input { sshPrivateKey, sshPassphrase, installationTest, + repo, }; } @@ -69,7 +72,7 @@ export async function main(input: Input) { } const debianRepo = `${input.sshHost}:${input.sshHostPath}`; - const packagesPath = `.Packages-${input.version}`; + const packagesPath = `.Packages-${input.repo}-${input.version}`; const allPackagesPath = "Packages"; const allPackagesGzippedPath = "Packages.gz";