[chore] Use env vars when running shell commands in CI (open-telemetr…

…y#25002) Follows open-telemetry/opentelemetry-collector#8177
bogdandrutu · Aug 7, 2023 · 9a8b29e · 9a8b29e
1 parent 89e812d
commit 9a8b29e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -24,6 +24,8 @@ jobs:
  changelog:
  runs-on: ubuntu-latest
  if: ${{ github.actor != 'dependabot[bot]' }}
+ env:
+ PR_HEAD: ${{ github.event.pull_request.head.sha }}
 
  steps:
  - uses: actions/checkout@v3
@@ -46,7 +48,7 @@ jobs:
  - name: Ensure no changes to the CHANGELOG.md or CHANGELOG-API.md
  if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}}
  run: |
- if [[ $(git diff --name-only $(git merge-base origin/main ${{ github.event.pull_request.head.sha }}) ${{ github.event.pull_request.head.sha }} ./CHANGELOG*.md) ]]
+ if [[ $(git diff --name-only $(git merge-base origin/main $PR_HEAD) $PR_HEAD ./CHANGELOG*.md) ]]
  then
  echo "CHANGELOG.md and CHANGELOG-API.md should not be directly modified."
  echo "Please add a .yaml file to the ./.chloggen/ directory."
@@ -60,7 +62,7 @@ jobs:
  - name: Ensure ./.chloggen/*.yaml addition(s)
  if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}}
  run: |
- if [[ 1 -gt $(git diff --diff-filter=A --name-only $(git merge-base origin/main ${{ github.event.pull_request.head.sha }}) ${{ github.event.pull_request.head.sha }} ./.chloggen | grep -c \\.yaml) ]]
+ if [[ 1 -gt $(git diff --diff-filter=A --name-only $(git merge-base origin/main $PR_HEAD) $PR_HEAD ./.chloggen | grep -c \\.yaml) ]]
  then
  echo "No changelog entry was added to the ./.chloggen/ directory."
  echo "Please add a .yaml file to the ./.chloggen/ directory."

diff --git a/.github/workflows/check-links.yaml b/.github/workflows/check-links.yaml
@@ -13,6 +13,8 @@ jobs:
  changedfiles:
  name: changed files
  runs-on: ubuntu-latest
+ env:
+ PR_HEAD: ${{ github.event.pull_request.head.sha }}
  if: ${{ github.actor != 'dependabot[bot]' }}
  outputs:
  md: ${{ steps.changes.outputs.md }}
@@ -23,7 +25,7 @@ jobs:
  - name: Get changed files
  id: changes
  run: |
- echo "md=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main ${{ github.event.pull_request.head.sha }}) ${{ github.event.pull_request.head.sha }} | grep .md$ | xargs)" >> $GITHUB_OUTPUT
+ echo "md=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main $PR_HEAD) $PR_HEAD | grep .md$ | xargs)" >> $GITHUB_OUTPUT
  check-links:
  runs-on: ubuntu-latest
  needs: changedfiles