From e1d5ef16702490ecb5b5aa2aa54eff181a0b3f44 Mon Sep 17 00:00:00 2001 From: Mike Roberts <2947595+m-roberts@users.noreply.github.com> Date: Mon, 26 Oct 2020 21:52:29 +0000 Subject: [PATCH 1/6] Try AMD64 architecture; see what happens --- main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.js b/main.js index 840d519..d6c554d 100644 --- a/main.js +++ b/main.js @@ -126,7 +126,8 @@ async function main() { await exec.exec("docker", [ "exec", container, - "dpkg-buildpackage", "--no-sign", "-d", "-aarmhf" + // "dpkg-buildpackage", "--no-sign", "-d", "-aarmhf" + "dpkg-buildpackage", "--no-sign", "-d", "-aamd64" ]) core.endGroup() From fda0e8088ec2546570e1fcf1a0fc99250a43b4ca Mon Sep 17 00:00:00 2001 From: Mike Roberts <2947595+m-roberts@users.noreply.github.com> Date: Mon, 26 Oct 2020 22:16:00 +0000 Subject: [PATCH 2/6] Attempt to install libpython3.7-minimal:armhf --- main.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/main.js b/main.js index d6c554d..3b4a4ce 100644 --- a/main.js +++ b/main.js @@ -110,7 +110,7 @@ async function main() { await exec.exec("docker", [ "exec", container, - "apt-get", "install", "--no-install-recommends", "-y", "dpkg-dev", "debhelper", "devscripts", "equivs" + "apt-get", "install", "--no-install-recommends", "-y", "dpkg-dev", "debhelper", "devscripts", "equivs", "libpython3.7-minimal:armhf" ]) core.endGroup() @@ -126,8 +126,7 @@ async function main() { await exec.exec("docker", [ "exec", container, - // "dpkg-buildpackage", "--no-sign", "-d", "-aarmhf" - "dpkg-buildpackage", "--no-sign", "-d", "-aamd64" + "dpkg-buildpackage", "--no-sign", "-d", "-aarmhf" ]) core.endGroup() From 1c9125284267c8723ce215f8c8d35a808a3546fb Mon Sep 17 00:00:00 2001 From: Mike Roberts <2947595+m-roberts@users.noreply.github.com> Date: Mon, 26 Oct 2020 22:20:28 +0000 Subject: [PATCH 3/6] Add armhf architecture --- main.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/main.js b/main.js index 3b4a4ce..69793f0 100644 --- a/main.js +++ b/main.js @@ -98,6 +98,14 @@ async function main() { core.endGroup() } + core.startGroup("Add armhf architecture") + await exec.exec("docker", [ + "exec", + container, + "dpkg", "--add-architecture", "armhf" + ]) + core.endGroup() + core.startGroup("Update packages list") await exec.exec("docker", [ "exec", From 2a340543032b5767fc6f94bf13999767ea9a8ea5 Mon Sep 17 00:00:00 2001 From: Mike Roberts <2947595+m-roberts@users.noreply.github.com> Date: Mon, 26 Oct 2020 22:23:51 +0000 Subject: [PATCH 4/6] Don't look for source name in artefacts --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index 69793f0..2eddaf1 100644 --- a/main.js +++ b/main.js @@ -145,7 +145,7 @@ async function main() { "find", buildDirectory, "-maxdepth", "1", - "-name", `${package}*${version}*.*`, + "-name", `*${version}*.*`, "-type", "f", "-print", "-exec", "mv", "{}", artifactsDirectory, ";" From 515c38e5e0d8c5ff701e8872159ba6ce0d42f0f3 Mon Sep 17 00:00:00 2001 From: Mike Roberts <2947595+m-roberts@users.noreply.github.com> Date: Mon, 26 Oct 2020 22:29:54 +0000 Subject: [PATCH 5/6] Select target architecture --- main.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/main.js b/main.js index 2eddaf1..675ac7e 100644 --- a/main.js +++ b/main.js @@ -22,6 +22,8 @@ async function getOS(distribution) { async function main() { try { + const targetArchitecture = core.getInput("target_architecture") || "armhf" + const sourceRelativeDirectory = core.getInput("source_directory") || "./" const artifactsRelativeDirectory = core.getInput("artifacts_directory") || "./" @@ -98,11 +100,11 @@ async function main() { core.endGroup() } - core.startGroup("Add armhf architecture") + core.startGroup("Add target architecture") await exec.exec("docker", [ "exec", container, - "dpkg", "--add-architecture", "armhf" + "dpkg", "--add-architecture", targetArchitecture ]) core.endGroup() @@ -118,7 +120,7 @@ async function main() { await exec.exec("docker", [ "exec", container, - "apt-get", "install", "--no-install-recommends", "-y", "dpkg-dev", "debhelper", "devscripts", "equivs", "libpython3.7-minimal:armhf" + "apt-get", "install", "--no-install-recommends", "-y", "dpkg-dev", "debhelper", "devscripts", "equivs", "libpython3.7-minimal:" + targetArchitecture ]) core.endGroup() @@ -134,7 +136,7 @@ async function main() { await exec.exec("docker", [ "exec", container, - "dpkg-buildpackage", "--no-sign", "-d", "-aarmhf" + "dpkg-buildpackage", "--no-sign", "-d", "-a" + targetArchitecture ]) core.endGroup() From 45a92886fe679839a452d7584dfbf069dcf6309d Mon Sep 17 00:00:00 2001 From: Mike Roberts <2947595+m-roberts@users.noreply.github.com> Date: Mon, 26 Oct 2020 22:35:23 +0000 Subject: [PATCH 6/6] Remove need for mk-build-deps --- main.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/main.js b/main.js index 675ac7e..4de71fd 100644 --- a/main.js +++ b/main.js @@ -120,7 +120,12 @@ async function main() { await exec.exec("docker", [ "exec", container, - "apt-get", "install", "--no-install-recommends", "-y", "dpkg-dev", "debhelper", "devscripts", "equivs", "libpython3.7-minimal:" + targetArchitecture + "apt-get", "install", "--no-install-recommends", "-y", + // General packaging stuff + "dpkg-dev", + "debhelper", + // Used by pybuild + "libpython3.7-minimal:" + targetArchitecture ]) core.endGroup() @@ -128,7 +133,7 @@ async function main() { await exec.exec("docker", [ "exec", container, - "mk-build-deps", "-ir", "-t", "apt-get -o Debug::pkgProblemResolver=yes -y --no-install-recommends" + "apt-get", "build-dep", "-y", sourceDirectory ]) core.endGroup() @@ -136,7 +141,7 @@ async function main() { await exec.exec("docker", [ "exec", container, - "dpkg-buildpackage", "--no-sign", "-d", "-a" + targetArchitecture + "dpkg-buildpackage", "--no-sign", "-a" + targetArchitecture ]) core.endGroup()