From 40c6928c761884832d5e2756ca3f8aebceb877df Mon Sep 17 00:00:00 2001 From: JonJagger Date: Tue, 17 Mar 2026 19:06:35 +0000 Subject: [PATCH 1/2] Update workflow actions to move past old node warnings --- .github/workflows/main.yml | 14 +++++++------- .github/workflows/push_badhaxr_to_ecr.yml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 32fdc52d..11ee6877 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 1 @@ -82,7 +82,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 1 @@ -107,7 +107,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 1 @@ -181,7 +181,7 @@ jobs: with: image_digest: ${{ needs.build-image.outputs.digest }} - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 1 @@ -235,7 +235,7 @@ jobs: with: image_digest: ${{ needs.build-image.outputs.digest }} - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 1 @@ -284,7 +284,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 @@ -349,7 +349,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 diff --git a/.github/workflows/push_badhaxr_to_ecr.yml b/.github/workflows/push_badhaxr_to_ecr.yml index 1787d5b2..002ed68f 100644 --- a/.github/workflows/push_badhaxr_to_ecr.yml +++ b/.github/workflows/push_badhaxr_to_ecr.yml @@ -38,13 +38,13 @@ jobs: contents: write steps: - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v4 + uses: aws-actions/configure-aws-credentials@v6 with: aws-region: ${{ needs.setup.outputs.aws_region }} role-duration-seconds: 900 role-session-name: ${{ github.event.repository.name }} role-to-assume: arn:aws:iam::${{ needs.setup.outputs.aws_account_id }}:role/${{ needs.setup.outputs.gh_actions_iam_role_name }} - mask-aws-account-id: no + mask-aws-account-id: false - name: Login to Amazon ECR id: login-ecr From ca740be2588aa9b3a0b304339b6abeee60365375 Mon Sep 17 00:00:00 2001 From: JonJagger Date: Tue, 17 Mar 2026 19:15:05 +0000 Subject: [PATCH 2/2] Update to better test expected message --- bin/build_image.sh | 2 +- test/server/differ_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/build_image.sh b/bin/build_image.sh index c2a2247c..254bc56d 100755 --- a/bin/build_image.sh +++ b/bin/build_image.sh @@ -84,7 +84,7 @@ build_image() docker tag "${image_name}" "cyberdojo/differ:${CYBER_DOJO_DIFFER_TAG}" echo echo " echo CYBER_DOJO_DIFFER_SHA=${CYBER_DOJO_DIFFER_SHA}" - echo " echo CYBER_DOJO_DIFFER_TAG=${CYBER_DOJO_DIFFER_TAG}"] + echo " echo CYBER_DOJO_DIFFER_TAG=${CYBER_DOJO_DIFFER_TAG}" echo echo "${image_name}" fi diff --git a/test/server/differ_test.rb b/test/server/differ_test.rb index 1be37edc..700dbe50 100644 --- a/test/server/differ_test.rb +++ b/test/server/differ_test.rb @@ -294,7 +294,7 @@ def self.version_test(version, id58_suffix, *lines, &block) ex = assert_raises(RuntimeError) do differ.diff_lines(id: id, was_index: 1, now_index: 2) end - assert_equal 'Invalid index 1', ex.message + assert_equal 'Invalid +ve index 1 [1 event]', ex.message end private