Skip to content

Commit 1ed4799

Browse files
authored
Actually generate javadoc on latest JDK version (#1442)
We need to pass `-Pcom.ibm.wala.jdk-version` in the `generate-latest-docs.sh` script. Attempted to test locally, but the real test will be when this lands.
1 parent 81149df commit 1ed4799

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,20 @@ jobs:
7272
needs: build_gradle
7373
if: github.event_name == 'push' && github.repository == 'wala/WALA' && github.ref == 'refs/heads/master'
7474
runs-on: ubuntu-latest
75+
env:
76+
JDK_VERSION: 23
7577
steps:
7678
- name: 'Check out repository'
7779
uses: actions/checkout@v4
78-
- name: Cache Goomph
79-
uses: actions/cache@v4
80-
with:
81-
path: ~/.goomph
82-
key: ${{ runner.os }}-goomph-${{ hashFiles('build.gradle') }}
83-
restore-keys: ${{ runner.os }}-goomph-
84-
- name: 'Set up JDK 21'
80+
- name: 'Set up JDK'
8581
uses: actions/setup-java@v4
8682
with:
87-
java-version: 21
83+
java-version: ${{ env.JDK_VERSION }}
8884
distribution: 'temurin'
8985
- name: Setup Gradle
9086
uses: gradle/actions/setup-gradle@v4
9187
- name: 'Generate latest docs'
9288
env:
9389
GITHUB_TOKEN: ${{ secrets.WALA_BOT_GH_TOKEN }}
94-
run: ./generate-latest-docs.sh
90+
run: ./generate-latest-docs.sh ${{ env.JDK_VERSION }}
91+

generate-latest-docs.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818

1919
echo -e "Publishing docs...\n"
2020

21+
if [ $# -eq 0 ]; then
22+
echo "No JDK version provided. Usage: $0 <JDK_VERSION>"
23+
exit 1
24+
fi
25+
26+
JDK_VERSION=$1
27+
2128
JAVADOC_DIR=$HOME/wala-javadoc
2229

2330
git clone --quiet --filter=tree:0 https://x-access-token:"${GITHUB_TOKEN}"@github.com/wala/javadoc "$JAVADOC_DIR" > /dev/null
@@ -26,7 +33,7 @@ git clone --quiet --filter=tree:0 https://x-access-token:"${GITHUB_TOKEN}"@githu
2633
rm -rf ./*
2734
)
2835

29-
./gradlew aggregatedJavadocs --no-configuration-cache
36+
./gradlew aggregatedJavadocs --no-configuration-cache "-Pcom.ibm.wala.jdk-version=$JDK_VERSION"
3037
rsync -a build/docs/javadoc/ "${JAVADOC_DIR}"
3138

3239
cd "$JAVADOC_DIR"

0 commit comments

Comments
 (0)