From 08c23b6a568e97b2cec486660161cb9c71397ca5 Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Mon, 4 Mar 2024 15:40:22 +0100 Subject: [PATCH] feature/fix key loading --- .github/workflows/cookiecutter.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cookiecutter.yml b/.github/workflows/cookiecutter.yml index d0882a41..c1351c5a 100644 --- a/.github/workflows/cookiecutter.yml +++ b/.github/workflows/cookiecutter.yml @@ -47,14 +47,14 @@ jobs: SIGNING_KEY: ${{ secrets.SIGNING_KEY }} SIGNING_PUB: ${{ secrets.SIGNING_PUB }} run: | + eval "$(ssh-agent -s)" mkdir -p 700 ~/.ssh - echo $SIGNING_PUB >> ~/.ssh/mex.pub + echo $SIGNING_PUB > ~/.ssh/mex.pub chmod 644 ~/.ssh/mex.pub - echo $SIGNING_KEY >> ~/.ssh/mex + echo $SIGNING_KEY > ~/.ssh/mex chmod 600 ~/.ssh/mex - eval "$(ssh-agent -s)" - ssh-add ~/.ssh/mex ls -lah ~/.ssh + ssh-add ~/.ssh/mex ssh-add -L git config --local user.email ${{ vars.MEX_BOT_EMAIL }} git config --local user.name ${{ vars.MEX_BOT_USER }} @@ -81,7 +81,7 @@ jobs: cruft update --skip-apply-ask printf '# Changes\n\n- bumped cookiecutter template to %s/commit/%s\n' "$template_url" "$template_ref" > .cruft-pr-body if [[ $(git status --porcelain | grep .rej | wc -c) -ne 0 ]]; then - printf '\n# Conflicts\n' >> .cruft-pr-body + printf '\n# Conflicts\n' > .cruft-pr-body fi git status --porcelain | grep .rej | awk '{print $2;}' | while read -r line ; do printf '\n```' >> .cruft-pr-body