From 0676dbed513c287369ea90b2fbf4c019c06e2855 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Sat, 6 Jan 2024 15:33:04 +0100 Subject: [PATCH 1/3] Adding some debugging output --- main.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/main.js b/main.js index 148781a..3c97154 100644 --- a/main.js +++ b/main.js @@ -95,6 +95,10 @@ async function main() { console.log(details) core.endGroup() + core.startGroup("Check sourceDirectory") + await exec.exec("ls", ["-la", sourceDirectory]) + core.endGroup() + if (cpuArchitecture != "amd64") { core.startGroup("Install QEMU") // Need newer QEMU to avoid errors @@ -127,6 +131,21 @@ async function main() { ]) core.endGroup() + core.startGroup("Check sourceDirectory") + await exec.exec("docker", [ + "exec", + container, + "ls", "-la", sourceDirectory + ]) + core.endGroup() + + core.startGroup("Show container inspect") + await exec.exec("docker", [ + "inspect", + container + ]) + core.endGroup() + core.startGroup("Prepare environment") await exec.exec("docker", [ "exec", -- 2.43.4 From 7d43afb7a98782a5cc4e448ecf2519a32e4e5c47 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Sat, 6 Jan 2024 15:33:43 +0100 Subject: [PATCH 2/3] Change working dir and operate on . --- main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.js b/main.js index 3c97154..f5c0467 100644 --- a/main.js +++ b/main.js @@ -208,7 +208,8 @@ async function main() { "exec", container, "bash", "-c", - `apt-get build-dep -yq -t '${imageTag}' '${sourceDirectory}' || apt-get build-dep -yq '${sourceDirectory}'` +// `apt-get build-dep -yq -t '${imageTag}' '${sourceDirectory}' || apt-get build-dep -yq '${sourceDirectory}'` + `cd '${sourceDirectory}' && apt-get build-dep -yq -t '${imageTag}' . || apt-get build-dep -yq .` ]) core.endGroup() } -- 2.43.4 From b8d01dd582a9d2eedb34b2c6dddc57010da22eb5 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Sat, 6 Jan 2024 20:31:37 +0100 Subject: [PATCH 3/3] Going wild --- .github/workflows/test.yml | 66 +++++++++++++++++++------------------- main.js | 45 ++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 36 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8229413..b06d05f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,44 +12,44 @@ jobs: strategy: matrix: include: - - package: at - arch: arm - repo: https://salsa.debian.org/debian/at.git - ref: debian/3.2.2-1 - lintian_opts: "-v" - lintian_run: false - - package: lolcat - arch: arm64 - repo: https://salsa.debian.org/ruby-team/lolcat.git - ref: debian/100.0.1-2 - lintian_opts: "-v" - - package: micro - arch: amd64 - repo: https://salsa.debian.org/go-team/packages/micro.git - ref: debian/2.0.6-2_bpo10+1 - lintian_opts: "-v" - lintian_run: true +# - package: at +# arch: arm +# repo: https://salsa.debian.org/debian/at.git +# ref: debian/3.2.2-1 +# lintian_opts: "-v" +# lintian_run: false +# - package: lolcat +# arch: arm64 +# repo: https://salsa.debian.org/ruby-team/lolcat.git +# ref: debian/100.0.1-2 +# lintian_opts: "-v" +# - package: micro +# arch: amd64 +# repo: https://salsa.debian.org/go-team/packages/micro.git +# ref: debian/2.0.6-2_bpo10+1 +# lintian_opts: "-v" +# lintian_run: true - package: dropbear arch: amd64 repo: https://salsa.debian.org/debian/dropbear.git ref: debian/2022.83-1_bpo11+1 lintian_opts: "-v" - - package: deber - arch: arm64 - repo: https://github.com/dawidd6/deber.git - ref: v1.0.0 - lintian_opts: "-v" - install_skopeo: true - - package: netcat-openbsd - arch: arm64 - repo: https://git.launchpad.net/ubuntu/+source/netcat-openbsd - ref: import/1.206-1ubuntu1 - lintian_opts: "-v" - - package: iproute2 - arch: arm - repo: https://git.launchpad.net/ubuntu/+source/iproute2 - ref: import/4.18.0-1ubuntu2_ubuntu18.04.1 - lintian_opts: "-v" +# - package: deber +# arch: arm64 +# repo: https://github.com/dawidd6/deber.git +# ref: v1.0.0 +# lintian_opts: "-v" +# install_skopeo: true +# - package: netcat-openbsd +# arch: arm64 +# repo: https://git.launchpad.net/ubuntu/+source/netcat-openbsd +# ref: import/1.206-1ubuntu1 +# lintian_opts: "-v" +# - package: iproute2 +# arch: arm +# repo: https://git.launchpad.net/ubuntu/+source/iproute2 +# ref: import/4.18.0-1ubuntu2_ubuntu18.04.1 +# lintian_opts: "-v" steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/main.js b/main.js index f5c0467..5da0bf0 100644 --- a/main.js +++ b/main.js @@ -68,8 +68,8 @@ async function main() { const match = changelog.match(regex) const { pkg, epoch, version, revision, packageDistribution } = match.groups const distribution = osDistribution ? osDistribution : packageDistribution - const imageName = await getImageName(distribution) - const imageTag = await getImageTag(imageName, distribution) + const imageName = "ubuntu" + const imageTag = "jammy" const container = pkg const image = imageName + ":" + imageTag @@ -99,6 +99,16 @@ async function main() { await exec.exec("ls", ["-la", sourceDirectory]) core.endGroup() + core.startGroup("Create test files") + await exec.exec("mkdir", ["-p", workspaceDirectory + "/foo"]) + await exec.exec("touch", [ workspaceDirectory + "/foo/bar.txt"]) + core.endGroup() + + core.startGroup("Check test files") + await exec.exec("ls", ["-la", workspaceDirectory]) + await exec.exec("ls", ["-la", workspaceDirectory + "/foo"]) + core.endGroup() + if (cpuArchitecture != "amd64") { core.startGroup("Install QEMU") // Need newer QEMU to avoid errors @@ -113,7 +123,7 @@ async function main() { "--platform", `linux/${cpuArchitecture}`, "--name", container, "--volume", workspaceDirectory + ":" + workspaceDirectory, - "--workdir", sourceDirectory, + "--workdir", workspaceDirectory, "--env", "DEBIAN_FRONTEND=noninteractive", "--env", "DPKG_COLORS=always", "--env", "FORCE_UNSAFE_CONFIGURE=1", @@ -131,6 +141,28 @@ async function main() { ]) core.endGroup() + core.startGroup("Check workspaceDirectory") + await exec.exec("docker", [ + "exec", + container, + "ls", "-la", workspaceDirectory + ]) + core.endGroup() + + core.startGroup("Sleeping well ...") + await exec.exec("sleep", [ + "10000" + ]) + core.endGroup() + + core.startGroup("Check test files") + await exec.exec("docker", [ + "exec", + container, + "ls", "-la", workspaceDirectory + "/foo" + ]) + core.endGroup() + core.startGroup("Check sourceDirectory") await exec.exec("docker", [ "exec", @@ -146,6 +178,12 @@ async function main() { ]) core.endGroup() + core.startGroup("Sleeping well ...") + await exec.exec("sleep", [ + "10000" + ]) + core.endGroup() +/* core.startGroup("Prepare environment") await exec.exec("docker", [ "exec", @@ -284,6 +322,7 @@ async function main() { "-exec", "mv", "{}", artifactsDirectory, ";" ]) core.endGroup() +*/ } catch (error) { core.setFailed(error.message) } -- 2.43.4