Skip to content
Closed
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- { path: terraform, name: terraform }
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Prepare environment variables
run: |
echo "BRANCH_REF=$(echo '${{ github.ref }}' | sed -E 's/[^A-Za-z0-9]+/-/g')" >> $GITHUB_ENV
Expand Down Expand Up @@ -99,6 +99,6 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: sudo apt-get update -y && sudo apt-get install --no-install-recommends shellcheck
- run: ./bin/lint
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Prepare environment variables
run: |
echo "BASE_IMAGE=ubuntu:18.04" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gems.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- uses: actions/setup-ruby@v1
- run: |
[ -d ~/.gem ] || mkdir ~/.gem
Expand Down
9 changes: 7 additions & 2 deletions bin/docker-execute
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ docker run -dit --rm \
-v "$(pwd)/rfc:/home/dependabot/rfc" \
--name "$CONTAINER_NAME" \
-e SSH_AUTH_SOCK=$SSH_AUTH_SOCK \
-e SSH_PASSPHRASE=$SSH_PASSPHRASE_DEPENDABOT \
-e SSH_PASSPHRASE=$SSH_PASSPHRASE \
--env "LOCAL_GITHUB_ACCESS_TOKEN=$LOCAL_GITHUB_ACCESS_TOKEN" \
"${DOCKER_OPTS[@]}" \
--cap-add=SYS_PTRACE \
Expand All @@ -235,7 +235,12 @@ docker run -dit --rm \
docker exec -e PACKAGE_NAME=$PACKAGE_NAME -e REPO_NAME=$REPO_NAME ${CONTAINER_NAME} bash -c 'eval $(ssh-agent);
chmod 400 ~/.ssh/id_rsa ;
#chmod +rwx /home/dependabot/rfc;
sshpass -P passphrase -p $SSH_PASSPHRASE ssh-add /home/dependabot/.ssh/id_rsa;
sshpass -P passphrase -p $SSH_PASSPHRASE ssh-add /home/dependabot/.ssh/id_rsa;

for c in $(ssh -p 29418 athmika@gerrit.helpshift.com gerrit query --current-patch-set project:${REPO_NAME} branch:feature/dependabot | grep revision | tr -s " " | cut -d " " -f 3); \

do ssh -p 29418 athmika@gerrit.helpshift.com gerrit review $c --abandon; \
done;
bin/dry-run.rb --provider gerrit $PACKAGE_NAME $REPO_NAME'

#echo "Running dependabot for $1"
Expand Down