From 69fe9bd32dbc620daeb87dda32e326961916cf52 Mon Sep 17 00:00:00 2001 From: openoms Date: Thu, 19 Jan 2023 07:12:59 +0000 Subject: [PATCH] ci: remove ssh host keys only once --- .github/workflows/amd64-image-build.yml | 4 ++-- .github/workflows/arm64-rpi-image-build.yml | 4 ++-- ci/arm64-rpi/arm64-rpi.pkr.hcl | 9 +-------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/amd64-image-build.yml b/.github/workflows/amd64-image-build.yml index bab554f..f8ff37a 100644 --- a/.github/workflows/amd64-image-build.yml +++ b/.github/workflows/amd64-image-build.yml @@ -7,7 +7,7 @@ on: - '*.md' - '.gitignore' - 'images' - - 'ci/arm64-rpi' + - 'ci/arm64-rpi/**' - 'scripts/jam-remote' pull_request: branches: [ "master" ] @@ -15,7 +15,7 @@ on: - '*.md' - '.gitignore' - 'images' - - 'ci/arm64-rpi' + - 'ci/arm64-rpi/**' - 'scripts/jam-remote' workflow_dispatch: diff --git a/.github/workflows/arm64-rpi-image-build.yml b/.github/workflows/arm64-rpi-image-build.yml index be462f6..6d2c1f5 100644 --- a/.github/workflows/arm64-rpi-image-build.yml +++ b/.github/workflows/arm64-rpi-image-build.yml @@ -7,7 +7,7 @@ on: - '*.md' - '.gitignore' - 'images' - - 'ci/amd64' + - 'ci/amd64/**' - 'scripts/jam-remote' - 'Makefile' pull_request: @@ -16,7 +16,7 @@ on: - '*.md' - '.gitignore' - 'images' - - 'ci/amd64' + - 'ci/amd64/**' - 'scripts/jam-remote' - 'Makefile' workflow_dispatch: diff --git a/ci/arm64-rpi/arm64-rpi.pkr.hcl b/ci/arm64-rpi/arm64-rpi.pkr.hcl index e0f0995..e6ab2a1 100644 --- a/ci/arm64-rpi/arm64-rpi.pkr.hcl +++ b/ci/arm64-rpi/arm64-rpi.pkr.hcl @@ -49,18 +49,11 @@ build { } provisioner "shell" { - environment_vars = [ + environment_vars = [ "github_user=${var.github_user}", "branch=${var.branch}" ] script = "./joininbox.sh" } - provisioner "shell" { - inline = [ - "echo '# Deleting the SSH pub keys (will be recreate on the first boot) ...'", - "rm /etc/ssh/ssh_host_*", - "echo 'OK'", - ] - } }