From e6ae7eed593bec9a162e9abe4f5535acd0006b9d Mon Sep 17 00:00:00 2001 From: Hayden Young <22327045+hbjydev@users.noreply.github.com> Date: Sun, 16 Jun 2024 00:08:11 +0100 Subject: [PATCH 1/2] docs: correct GFM syntax for admonitions --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e6fa768..2e4ed66 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ as part of the Nix store. There is also an `altf4` user baked into all images that has a list of trusted SSH keys on it. This user is for administrative purposes. -> ![NOTE] +> [!NOTE] > On AMIs, the SSH keypair for `altf4` will not be overridden by setting the > SSH Key Pair option when provisioning the AMI. That option only applies to > the `root` user. @@ -54,7 +54,7 @@ $ just build ecs-node ### Publishing an AMI to EC2 -> ![NOTE] +> [!NOTE] > Using this if you're not a member of ALT-F4 requires some more steps. See > [`aws/README.md`](./aws/README.md) for more info. From 882cd1753be1d41a3ce964ea97d8c5ec1387a0e5 Mon Sep 17 00:00:00 2001 From: Hayden Young <22327045+hbjydev@users.noreply.github.com> Date: Sun, 16 Jun 2024 00:08:23 +0100 Subject: [PATCH 2/2] fix: use group() func for last two command groups --- ci-build-publish.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci-build-publish.sh b/ci-build-publish.sh index 312c25d..05033eb 100644 --- a/ci-build-publish.sh +++ b/ci-build-publish.sh @@ -67,15 +67,15 @@ echo "New snapshot is $snapshot_id." ciout snapshot_id "$snapshot_id" endgroup -echo "::group::Registering new AMI" +group "Registering new AMI" ami_id=$(aws ec2 register-image --architecture x86_64 --ena-support --name "$image_name" --description "A NixOS AMI: {{profile}}" --block-device-mappings "DeviceName=/dev/sda1,Ebs={SnapshotId=$snapshot_id}" --root-device-name /dev/sda1 | jq .ImageId) echo "AMI is registered: $ami_id" ciout ami_id "$ami_id" -echo "::endgroup::" +endgroup -echo "::group::Cleaning up image VHD from bucket" +group "Cleaning up image VHD from bucket" aws s3 rm "s3://$bucket/$image_name.vhd" -echo "::endgroup::" +endgroup cisum "# :rocket: AMI build successful" cisum ""