diff --git a/.github/workflows/scala-test-webstage.yml b/.github/workflows/scala-test-webstage.yml index ca04de1..0f84f6f 100644 --- a/.github/workflows/scala-test-webstage.yml +++ b/.github/workflows/scala-test-webstage.yml @@ -13,16 +13,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Create code archive run: zip -r code.zip doc js-api js-client project shared web .sbtopts build.sbt README.md - - name: Set up JDK 11 - uses: actions/setup-java@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '17' distribution: 'temurin' - - name: Coursier cache - uses: coursier/cache-action@v6 + cache: 'sbt' - name: Run tests run: sbt "shared/test" - name: Compile webtool @@ -32,7 +31,7 @@ jobs: - name: Add code archive to web deployment run: mv code.zip web/target/web/stage/ - name: Deploy CI - uses: burnett01/rsync-deployments@5.2 + uses: burnett01/rsync-deployments@7.0.1 with: switches: -avzr --delete path: web/target/web/stage/ @@ -43,22 +42,22 @@ jobs: - name: Remove code archive from artifact run: rm web/target/web/stage/code.zip - name: Archive production webclient artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ltbt-spectroscopy-webclient path: | web/target/web/stage - name: Archive production JS api artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ltbt-spectroscopy-js-api path: | js-api/target/eqfiddle-api.js - - name: Cleanup before cache - shell: bash - run: | - rm -rf "$HOME/.ivy2/local" || true - find $HOME/Library/Caches/Coursier/v1 -name "ivydata-*.properties" -delete || true - find $HOME/.ivy2/cache -name "ivydata-*.properties" -delete || true - find $HOME/.cache/coursier/v1 -name "ivydata-*.properties" -delete || true - find $HOME/.sbt -name "*.lock" -delete || true + # - name: Cleanup before cache + # shell: bash + # run: | + # rm -rf "$HOME/.ivy2/local" || true + # find $HOME/Library/Caches/Coursier/v1 -name "ivydata-*.properties" -delete || true + # find $HOME/.ivy2/cache -name "ivydata-*.properties" -delete || true + # find $HOME/.cache/coursier/v1 -name "ivydata-*.properties" -delete || true + # find $HOME/.sbt -name "*.lock" -delete || true