Skip to content

Commit

Permalink
Merge branch 'main' into james/geomcoll
Browse files Browse the repository at this point in the history
  • Loading branch information
James Cor committed Oct 18, 2022
2 parents f89a2c1 + 1282422 commit c2fafa6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/bump-dependency.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
run: |
if [ "$REPO" == "vitess" ]
then
echo "::set-output name=label::vitess-bump"
echo "label=vitess-bump" >> $GITHUB_OUTPUT
else
echo "$REPO is unsupported"
exit 1
Expand Down Expand Up @@ -105,16 +105,16 @@ jobs:
run: |
if [ "${{ github.event.client_payload.assignee }}" == "zachmu" ]
then
echo "::set-output name=reviewer::Hydrocharged"
echo "reviewer=Hydrocharged" >> $GITHUB_OUTPUT
else
echo "::set-output name=reviewer::zachmu"
echo "reviewer=zachmu" >> $GITHUB_OUTPUT
fi
- name: Get short hash
id: short-sha
run: |
commit=${{ github.event.client_payload.head_commit_sha }}
short=${commit:0:8}
echo "::set-output name=short::$short"
echo "short=$short" >> $GITHUB_OUTPUT
- name: Create and Push new branch
run: |
git config --global --add user.name "${{ github.event.client_payload.assignee }}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ jobs:
run: |
changes=$(git status --porcelain)
if [ ! -z "$changes" ]; then
echo "::set-output name=has-changes::true"
echo "has-changes=true" >> $GITHUB_OUTPUT
fi
- uses: EndBug/add-and-commit@v7
- uses: EndBug/add-and-commit@v9.1.1
if: ${{ steps.detect-changes.outputs.has-changes == 'true' }}
with:
message: "[ga-format-pr] Run ./format_repo.sh to fix formatting"
Expand Down

0 comments on commit c2fafa6

Please sign in to comment.