Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 1

Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 1

Expand All @@ -107,7 +107,7 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 1

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -284,7 +284,7 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0

Expand Down Expand Up @@ -349,7 +349,7 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push_badhaxr_to_ecr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bin/build_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/server/differ_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading