diff --git a/.github/workflows/direct-push.yml b/.github/workflows/direct-push.yml index 167253ac6db..9046022af66 100644 --- a/.github/workflows/direct-push.yml +++ b/.github/workflows/direct-push.yml @@ -21,7 +21,7 @@ jobs: id: ismerge run: | ISMERGE=$(curl -H 'Accept: application/vnd.github.groot-preview+json' -H "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/${{ env.GITHUB_REPOSITORY }}/commits/${{ env.GITHUB_SHA }}/pulls | jq -r '.[] | select(.merge_commit_sha == "${{ env.GITHUB_SHA }}") | any') - echo "::set-output name=ismerge::$ISMERGE" + echo "ismerge=$ISMERGE" >> $GITHUB_OUTPUT # github events are eventually consistent, so wait until changes propagate to thier DB - run: sleep 60 if: steps.ismerge.outputs.ismerge != 'true' diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 3d00ed1b677..3a6e0ad63e5 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -23,7 +23,7 @@ jobs: - name: setup id: setup run: | - echo ::set-output name=title::"terraform-providers: update $(date -u +"%Y-%m-%d")" + echo "title=terraform-providers: update $(date -u +"%Y-%m-%d")" >> $GITHUB_OUTPUT - name: update terraform-providers run: | git config user.email "41898282+github-actions[bot]@users.noreply.github.com"