Skip to content

Commit 59e755e

Browse files
committed
use consistent COMMIT_SHA variable for Javadoc build and caching
1 parent 91e4548 commit 59e755e

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

Diff for: .github/workflows/build-and-deploy-javadoc.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ jobs:
1212
env:
1313
REPO: "processing/processing4"
1414

15+
outputs:
16+
commit_sha: ${{ steps.get-commit-sha.outputs.commit_sha }}
17+
1518
steps:
1619
- name: Get the latest release tag and commit SHA
1720
id: get-commit-sha
@@ -39,13 +42,15 @@ jobs:
3942
4043
echo "Commit SHA: $commit_sha"
4144
echo "commit_sha=$commit_sha" >> $GITHUB_ENV
45+
echo "commit_sha=$commit_sha" >> $GITHUB_OUTPUT
4246
4347
build-javadoc:
4448
runs-on: ubuntu-latest
4549
needs: fetch-latest-release
4650

4751
env:
4852
REMOTE_URL: "https://github.com/processing/processing4.git"
53+
COMMIT_SHA: ${{ needs.fetch-latest-release.outputs.commit_sha }}
4954

5055
steps:
5156
- name: Checkout repository
@@ -72,7 +77,7 @@ jobs:
7277
run: |
7378
git clone ${{ env.REMOTE_URL }} processing4
7479
cd processing4
75-
git checkout ${{ env.commit_sha }}
80+
git checkout ${{ env.COMMIT_SHA }}
7681
7782
- name: Generate Javadocs
7883
working-directory: processing4/build
@@ -86,7 +91,7 @@ jobs:
8691
uses: actions/cache@v4
8792
with:
8893
path: processing4/build/javadoc
89-
key: javadocs-${{ env.commit_sha }}
94+
key: javadocs-${{ env.COMMIT_SHA }}
9095
restore-keys: |
9196
javadocs-
9297
@@ -116,6 +121,8 @@ jobs:
116121
commit-javadoc:
117122
needs: build-javadoc
118123
runs-on: ubuntu-latest
124+
env:
125+
COMMIT_SHA: ${{ needs.fetch-latest-release.outputs.commit_sha }}
119126
steps:
120127
- name: Checkout repository
121128
uses: actions/checkout@v3
@@ -125,8 +132,8 @@ jobs:
125132
- name: Restore Javadocs from cache
126133
uses: actions/cache@v4
127134
with:
128-
path: doc
129-
key: javadocs-${{ env.commit_sha }}
135+
path: processing4/build/javadoc
136+
key: javadocs-${{ env.COMMIT_SHA }}
130137
restore-keys: |
131138
javadocs-
132139

0 commit comments

Comments
 (0)