diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6bfdf03..7e6718c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,22 +16,27 @@ jobs: runs-on: ubuntu-latest steps: - name: Pull Request Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: ${{github.event.pull_request.head.ref}} repository: ${{github.event.pull_request.head.repo.full_name}} if: github.head_ref != '' - name: Push Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 if: github.head_ref == '' - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: ${{matrix.jdk}} + java-version: ${{ matrix.jdk }} + distribution: 'temurin' - name: Set up Python 3 - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.9 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.0' - name: Install Python dependencies run: | python -m pip install --upgrade pip diff --git a/setup.sh b/setup.sh index d0ca517..2465cda 100755 --- a/setup.sh +++ b/setup.sh @@ -8,10 +8,10 @@ export JSR308=$(cd $(dirname "$0")/.. && pwd) # export SHELLOPTS -if [ -d "/tmp/plume-scripts" ] ; then - git -C /tmp/plume-scripts pull -q +if [ -d "/tmp/git-scripts" ] ; then + git -C /tmp/git-scripts pull -q else - git -C /tmp clone --depth 1 -q https://github.com/plume-lib/plume-scripts.git + git -C /tmp clone --depth 1 -q https://github.com/eisop-plume-lib/git-scripts.git fi #default value is opprop. REPO_SITE may be set to other value for travis test purpose. @@ -23,7 +23,7 @@ echo "------ Downloading everything from REPO_SITE: $REPO_SITE ------" if [ -d $JSR308/checker-framework-inference ] ; then (cd $JSR308/checker-framework-inference && git pull) else - /tmp/plume-scripts/git-clone-related $REPO_SITE checker-framework-inference $JSR308/checker-framework-inference + /tmp/git-scripts/git-clone-related $REPO_SITE checker-framework-inference $JSR308/checker-framework-inference fi (cd $JSR308/checker-framework-inference && ./.ci-build-without-test.sh && ./gradlew testLibJar) @@ -34,7 +34,7 @@ echo "Fetching DLJC" if [ -d $JSR308/do-like-javac ] ; then (cd $JSR308/do-like-javac && git pull) else - /tmp/plume-scripts/git-clone-related $REPO_SITE do-like-javac $JSR308/do-like-javac + /tmp/git-scripts/git-clone-related $REPO_SITE do-like-javac $JSR308/do-like-javac fi