Skip to content

Commit 40bf595

Browse files
committed
Repair getting the right commit for build-metadata
1 parent 8dad9d4 commit 40bf595

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

.github/workflows/build-preview-pages.yaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,16 @@ jobs:
1616
runs-on: ubuntu-latest
1717
env:
1818
ACTING_SHA: ${{ github.sha }}
19-
POSITION_FROM_TOP: 1
19+
POSITION_FROM_TOP: 2
2020
OUTPUT_NAME: 'machinekit-site-${{ github.sha }}'
2121
ACTING_REPOSITORY: ${{ github.repository }}
2222
steps:
23+
# Hack uptil conditional setting of environment variable is posible
24+
# (or this is reworked into an action)
25+
- name: Test for pull request or push
26+
if: github.event_name == 'push'
27+
run: echo ::set-env name=POSITION_FROM_TOP::1
28+
2329
# Locally clone the repository which we want to build with depth of 5 commits
2430
- name: Checkout the pull request for Machinekit-docs
2531
uses: actions/checkout@v2
@@ -33,7 +39,10 @@ jobs:
3339
run: echo ${{ env.ACTING_SHA }}
3440

3541
- name: Git log of repository on which the build is requested
36-
run: git log
42+
run: |
43+
git log
44+
echo "WHERE is HEAD"
45+
git log HEAD
3746
working-directory: ./to_build
3847

3948
# Create directory for output files and export it's name as a environment variable
@@ -49,12 +58,13 @@ jobs:
4958
- name: Create JSON with commit metadata
5059
env:
5160
FILENAME: '$OUTPUT_DIRECTORY/build-metadata.json'
61+
shell: bash
5262
run: |
5363
echo "###########################################################"
5464
echo "# Commit which will be used for mining of the credentials #"
5565
echo "###########################################################"
56-
git log -n 1 ${{ env.ACTING_SHA }}~$((${{ env.POSITION_FROM_TOP }}-1))
57-
jq -n --arg authoremail "$(git log --format='%ae' -n 1 ${{ env.ACTING_SHA }}~$((${{ env.POSITION_FROM_TOP }}-1)))" --arg authorname "$(git log --format='%an' -n 1 ${{ env.ACTING_SHA }}~$((${{ env.POSITION_FROM_TOP }}-1)))" --arg commitmsg "$(git log --format='%B' -n 1 ${{ env.ACTING_SHA }}~$((${{ env.POSITION_FROM_TOP }}-1)))" --arg sha "${{ env.ACTING_SHA }}" '{"author":"\($authorname)","email":"\($authoremail)","message":"\($commitmsg)","sha":"\($sha)"}' > ${{ env.FILENAME }}
66+
git log -n 1 $(echo HEAD~$((${{ env.POSITION_FROM_TOP }}-1)))
67+
jq -n --arg authoremail "$(git log --format='%ae' -n 1 $(echo HEAD~$((${{ env.POSITION_FROM_TOP }}-1))))" --arg authorname "$(git log --format='%an' -n 1 $(echo HEAD~$((${{ env.POSITION_FROM_TOP }}-1))))" --arg commitmsg "$(git log --format='%B' -n 1 $(echo HEAD~$((${{ env.POSITION_FROM_TOP }}-1))))" --arg sha "${{ env.ACTING_SHA }}" '{"author":"\($authorname)","email":"\($authoremail)","message":"\($commitmsg)","sha":"\($sha)"}' > ${{ env.FILENAME }}
5868
echo "###########################################################"
5969
echo "# JSON file with metadata information of pertinent commit #"
6070
echo "###########################################################"

0 commit comments

Comments
 (0)