Skip to content

chore(ci): dont detach ebs #6441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ludamad merged 3 commits into from
May 15, 2024
Merged

chore(ci): dont detach ebs #6441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d5a994
chore(ci): dont detach ebs
ludamad May 15, 2024
d77922b
fix lock
ludamad May 15, 2024
739f8d1
fix lock
ludamad May 15, 2024
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
2 changes: 1 addition & 1 deletion .github/ci-setup-action/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ runs:
if: ${{ inputs.concurrency_key }}
with:
run: |
while [ -f "${{ inputs.concurrency_key }}.lock" ]; do sleep 1 ; echo "Lock is currently held by $(cat '${{ inputs.concurrency_key }}.lock'), waiting..." ; done
while [ -f "/home/ubuntu/${{ inputs.concurrency_key }}.lock" ]; do sleep 1 ; echo "Lock is currently held by $(cat '/home/ubuntu/${{ inputs.concurrency_key }}.lock'), waiting..." ; done
echo "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" > "/home/ubuntu/${{ inputs.concurrency_key }}.lock"
echo "/home/ubuntu/${{ inputs.concurrency_key }}.lock acquired."
post: |
Expand Down
7 changes: 1 addition & 6 deletions scripts/ci/attach_ebs_cache.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,6 @@ while [ "$(aws ec2 describe-volumes \
elapsed_time=$((elapsed_time + WAIT_INTERVAL))
done

# First, make sure this is detached from any instances stuck in stopping state
aws ec2 detach-volume \
--region $REGION \
--volume-id $VOLUME_ID || true

# Attach volume to the instance
aws ec2 attach-volume \
--region $REGION \
Expand Down Expand Up @@ -162,4 +157,4 @@ rm -rf /var/lib/docker/tmp-images
systemctl restart docker
# important: everything (except earthly ls) should go through earthly-ci
scripts/earthly-ci bootstrap
touch /home/ubuntu/.setup-complete
touch /home/ubuntu/.setup-complete