From 8ede3a9b5eb55f634a26a25304a6e07fc871bb3f Mon Sep 17 00:00:00 2001 From: Manu Sridharan Date: Thu, 12 Sep 2024 09:25:00 -0700 Subject: [PATCH 1/8] bump versions of various actions --- .github/workflows/continuous-integration.yml | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 735dc358c..7d837809c 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -32,29 +32,29 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Check out WALA sources - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache Goomph - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.goomph key: ${{ runner.os }}-goomph-${{ hashFiles('build.gradle') }} restore-keys: ${{ runner.os }}-goomph- - name: 'Set up JDK ${{ matrix.java }}' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@v3 - name: Build and test using Gradle with ECJ - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: gradle-executable: xvfb-gradle.sh arguments: aggregatedJavadocs build publishAllPublicationsToFakeRemoteRepository shellcheck --no-configuration-cache -Pcom.ibm.wala.jdk-version=${{ matrix.java }} # testing ECJ compilation on any one OS is sufficient; we choose Linux arbitrarily if: runner.os == 'Linux' - name: Build and test using Gradle but without ECJ - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: aggregatedJavadocs javadoc build -PskipJavaUsingEcjTasks --no-configuration-cache -Pcom.ibm.wala.jdk-version=${{ matrix.java }} if: runner.os != 'Linux' @@ -84,17 +84,17 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Check out repository' - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache Goomph - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.goomph key: ${{ runner.os }}-goomph-${{ hashFiles('build.gradle') }} restore-keys: ${{ runner.os }}-goomph- - - name: 'Set up JDK 11' - uses: actions/setup-java@v3 + - name: 'Set up JDK 22' + uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 22 distribution: 'temurin' - name: 'Generate latest docs' env: From 649e16038d7aebe9780e1032cf821d0728bc2ecb Mon Sep 17 00:00:00 2001 From: Manu Sridharan Date: Thu, 12 Sep 2024 09:34:01 -0700 Subject: [PATCH 2/8] stick to LTS version --- .github/workflows/continuous-integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 7d837809c..3179eb666 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -91,10 +91,10 @@ jobs: path: ~/.goomph key: ${{ runner.os }}-goomph-${{ hashFiles('build.gradle') }} restore-keys: ${{ runner.os }}-goomph- - - name: 'Set up JDK 22' + - name: 'Set up JDK 21' uses: actions/setup-java@v4 with: - java-version: 22 + java-version: 21 distribution: 'temurin' - name: 'Generate latest docs' env: From c3ec60b13445f9062a7ebf994157944e4e6859cf Mon Sep 17 00:00:00 2001 From: Manu Sridharan Date: Thu, 12 Sep 2024 10:21:06 -0700 Subject: [PATCH 3/8] tweaks --- .github/workflows/continuous-integration.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 3179eb666..bc4eeac5e 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -44,19 +44,19 @@ jobs: with: java-version: ${{ matrix.java }} distribution: 'temurin' - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v3 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 - name: Build and test using Gradle with ECJ - uses: gradle/gradle-build-action@v3 - with: - gradle-executable: xvfb-gradle.sh - arguments: aggregatedJavadocs build publishAllPublicationsToFakeRemoteRepository shellcheck --no-configuration-cache -Pcom.ibm.wala.jdk-version=${{ matrix.java }} +# uses: gradle/gradle-build-action@v3 +# with: +# gradle-executable: xvfb-gradle.sh + run: ./gradlew aggregatedJavadocs build publishAllPublicationsToFakeRemoteRepository shellcheck --no-configuration-cache -Pcom.ibm.wala.jdk-version=${{ matrix.java }} # testing ECJ compilation on any one OS is sufficient; we choose Linux arbitrarily if: runner.os == 'Linux' - name: Build and test using Gradle but without ECJ - uses: gradle/gradle-build-action@v3 - with: - arguments: aggregatedJavadocs javadoc build -PskipJavaUsingEcjTasks --no-configuration-cache -Pcom.ibm.wala.jdk-version=${{ matrix.java }} +# uses: gradle/gradle-build-action@v3 +# with: + run: ./gradlew aggregatedJavadocs javadoc build -PskipJavaUsingEcjTasks --no-configuration-cache -Pcom.ibm.wala.jdk-version=${{ matrix.java }} if: runner.os != 'Linux' - name: Check for Git cleanliness after build and test run: ./check-git-cleanliness.sh @@ -96,6 +96,8 @@ jobs: with: java-version: 21 distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 - name: 'Generate latest docs' env: GITHUB_TOKEN: ${{ secrets.WALA_BOT_GH_TOKEN }} From 61e5da0260e5008ebcbb702f81e0f37ebcc7cff3 Mon Sep 17 00:00:00 2001 From: Manu Sridharan Date: Thu, 12 Sep 2024 10:45:36 -0700 Subject: [PATCH 4/8] remove other caching --- .github/workflows/continuous-integration.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index bc4eeac5e..1ff7d9334 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -33,12 +33,12 @@ jobs: steps: - name: Check out WALA sources uses: actions/checkout@v4 - - name: Cache Goomph - uses: actions/cache@v4 - with: - path: ~/.goomph - key: ${{ runner.os }}-goomph-${{ hashFiles('build.gradle') }} - restore-keys: ${{ runner.os }}-goomph- +# - name: Cache Goomph +# uses: actions/cache@v4 +# with: +# path: ~/.goomph +# key: ${{ runner.os }}-goomph-${{ hashFiles('build.gradle') }} +# restore-keys: ${{ runner.os }}-goomph- - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@v4 with: From cd57ae8293df4d0b5bcf638d93d4dce62aa7e517 Mon Sep 17 00:00:00 2001 From: Manu Sridharan Date: Thu, 12 Sep 2024 10:59:18 -0700 Subject: [PATCH 5/8] try some stuff --- .github/workflows/continuous-integration.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 1ff7d9334..7340a621c 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -47,17 +47,14 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - name: Build and test using Gradle with ECJ -# uses: gradle/gradle-build-action@v3 -# with: -# gradle-executable: xvfb-gradle.sh - run: ./gradlew aggregatedJavadocs build publishAllPublicationsToFakeRemoteRepository shellcheck --no-configuration-cache -Pcom.ibm.wala.jdk-version=${{ matrix.java }} + run: ./xvfb-gradle.sh aggregatedJavadocs build publishAllPublicationsToFakeRemoteRepository shellcheck --no-configuration-cache -Pcom.ibm.wala.jdk-version=${{ matrix.java }} # testing ECJ compilation on any one OS is sufficient; we choose Linux arbitrarily - if: runner.os == 'Linux' + if: runner.os != 'Windows' - name: Build and test using Gradle but without ECJ # uses: gradle/gradle-build-action@v3 # with: - run: ./gradlew aggregatedJavadocs javadoc build -PskipJavaUsingEcjTasks --no-configuration-cache -Pcom.ibm.wala.jdk-version=${{ matrix.java }} - if: runner.os != 'Linux' + run: gradlew.bat aggregatedJavadocs javadoc build -PskipJavaUsingEcjTasks --no-configuration-cache "-Pcom.ibm.wala.jdk-version=${{ matrix.java }}" + if: runner.os == 'Windows' - name: Check for Git cleanliness after build and test run: ./check-git-cleanliness.sh # not running in Borne or POSIX shell on Windows From 1b853f8189d668af31deca98dfff97057f42666f Mon Sep 17 00:00:00 2001 From: Manu Sridharan Date: Thu, 12 Sep 2024 11:04:31 -0700 Subject: [PATCH 6/8] Revert "try some stuff" This reverts commit cd57ae8293df4d0b5bcf638d93d4dce62aa7e517. --- .github/workflows/continuous-integration.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 7340a621c..1ff7d9334 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -47,14 +47,17 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - name: Build and test using Gradle with ECJ - run: ./xvfb-gradle.sh aggregatedJavadocs build publishAllPublicationsToFakeRemoteRepository shellcheck --no-configuration-cache -Pcom.ibm.wala.jdk-version=${{ matrix.java }} +# uses: gradle/gradle-build-action@v3 +# with: +# gradle-executable: xvfb-gradle.sh + run: ./gradlew aggregatedJavadocs build publishAllPublicationsToFakeRemoteRepository shellcheck --no-configuration-cache -Pcom.ibm.wala.jdk-version=${{ matrix.java }} # testing ECJ compilation on any one OS is sufficient; we choose Linux arbitrarily - if: runner.os != 'Windows' + if: runner.os == 'Linux' - name: Build and test using Gradle but without ECJ # uses: gradle/gradle-build-action@v3 # with: - run: gradlew.bat aggregatedJavadocs javadoc build -PskipJavaUsingEcjTasks --no-configuration-cache "-Pcom.ibm.wala.jdk-version=${{ matrix.java }}" - if: runner.os == 'Windows' + run: ./gradlew aggregatedJavadocs javadoc build -PskipJavaUsingEcjTasks --no-configuration-cache -Pcom.ibm.wala.jdk-version=${{ matrix.java }} + if: runner.os != 'Linux' - name: Check for Git cleanliness after build and test run: ./check-git-cleanliness.sh # not running in Borne or POSIX shell on Windows From d2fba71eb9b5068c565f256a1fc1f73205d76d07 Mon Sep 17 00:00:00 2001 From: Manu Sridharan Date: Thu, 12 Sep 2024 11:05:31 -0700 Subject: [PATCH 7/8] something else --- .github/workflows/continuous-integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 1ff7d9334..44deab02b 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -50,13 +50,13 @@ jobs: # uses: gradle/gradle-build-action@v3 # with: # gradle-executable: xvfb-gradle.sh - run: ./gradlew aggregatedJavadocs build publishAllPublicationsToFakeRemoteRepository shellcheck --no-configuration-cache -Pcom.ibm.wala.jdk-version=${{ matrix.java }} + run: ./xvfb-gradle.sh aggregatedJavadocs build publishAllPublicationsToFakeRemoteRepository shellcheck --no-configuration-cache "-Pcom.ibm.wala.jdk-version=${{ matrix.java }}" # testing ECJ compilation on any one OS is sufficient; we choose Linux arbitrarily if: runner.os == 'Linux' - name: Build and test using Gradle but without ECJ # uses: gradle/gradle-build-action@v3 # with: - run: ./gradlew aggregatedJavadocs javadoc build -PskipJavaUsingEcjTasks --no-configuration-cache -Pcom.ibm.wala.jdk-version=${{ matrix.java }} + run: ./gradlew aggregatedJavadocs javadoc build -PskipJavaUsingEcjTasks --no-configuration-cache "-Pcom.ibm.wala.jdk-version=${{ matrix.java }}" if: runner.os != 'Linux' - name: Check for Git cleanliness after build and test run: ./check-git-cleanliness.sh From 60d96130e33c7f45f82d9678b157bd67fe7b9902 Mon Sep 17 00:00:00 2001 From: Manu Sridharan Date: Thu, 12 Sep 2024 11:32:53 -0700 Subject: [PATCH 8/8] cleanup --- .github/workflows/continuous-integration.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 44deab02b..7f09ec0ef 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -33,12 +33,6 @@ jobs: steps: - name: Check out WALA sources uses: actions/checkout@v4 -# - name: Cache Goomph -# uses: actions/cache@v4 -# with: -# path: ~/.goomph -# key: ${{ runner.os }}-goomph-${{ hashFiles('build.gradle') }} -# restore-keys: ${{ runner.os }}-goomph- - name: 'Set up JDK ${{ matrix.java }}' uses: actions/setup-java@v4 with: @@ -47,15 +41,11 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - name: Build and test using Gradle with ECJ -# uses: gradle/gradle-build-action@v3 -# with: -# gradle-executable: xvfb-gradle.sh + # use xvfb-gradle.sh to avoid headless test failures on Linux run: ./xvfb-gradle.sh aggregatedJavadocs build publishAllPublicationsToFakeRemoteRepository shellcheck --no-configuration-cache "-Pcom.ibm.wala.jdk-version=${{ matrix.java }}" # testing ECJ compilation on any one OS is sufficient; we choose Linux arbitrarily if: runner.os == 'Linux' - name: Build and test using Gradle but without ECJ -# uses: gradle/gradle-build-action@v3 -# with: run: ./gradlew aggregatedJavadocs javadoc build -PskipJavaUsingEcjTasks --no-configuration-cache "-Pcom.ibm.wala.jdk-version=${{ matrix.java }}" if: runner.os != 'Linux' - name: Check for Git cleanliness after build and test