diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 8d62f4bcb..5f352b368 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -120,12 +120,22 @@ jobs: runs-on: ubuntu-latest if: github.event_name == 'pull_request' steps: + - name: Checkout cycamore + uses: actions/checkout@v4 + - name: Save PR number to file run: | echo "${{ github.event.number }}" > pr_number + echo "${{ github.event.pull_request.head.sha }} - $(git log -1 --format=%ci)" > commit_hash_timestamp - - name: Upload artifact + - name: Upload PR number artifact uses: actions/upload-artifact@v4 with: name: pr_number - path: pr_number \ No newline at end of file + path: pr_number + + - name: Upload Commit hash artifact + uses: actions/upload-artifact@v4 + with: + name: commit_hash_timestamp + path: commit_hash_timestamp \ No newline at end of file diff --git a/.github/workflows/pr_comment.yml b/.github/workflows/pr_comment.yml index a2632a915..afbf3e838 100644 --- a/.github/workflows/pr_comment.yml +++ b/.github/workflows/pr_comment.yml @@ -20,7 +20,7 @@ jobs: - name: Merge artifacts and get PR number run: | - echo "### Build Status Report" > artifacts_merged.md + echo "### Build Status Report - $(cat commit_hash_timestamp)" > artifacts_merged.md cat ./*.txt >> artifacts_merged.md echo "PR_NUMBER=$(cat pr_number)" >> "$GITHUB_ENV" diff --git a/CHANGELOG.rst b/CHANGELOG.rst index baf3cc3ea..1b75d0c8b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,7 +7,7 @@ cycamore Change Log * Downstream testing in CI workflows (#573, #580, #582, #583) * GitHub workflow for publishing images on release (#573, #582, #583) -* GitHub workflows for building/testing on a PR and push to `main` (#549, #564, #573, #582, #583) +* GitHub workflows for building/testing on a PR and push to `main` (#549, #564, #573, #582, #583, #590) * Add functionality for random behavior on the size (#550) and frequency (#565) of a sink * GitHub workflow to check that the CHANGELOG has been updated (#562) * Added inventory policies to Storage through the material buy policy (#574, #588)