diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d484d8..adf711b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,44 +23,33 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.17, 2.13.10] - java: [temurin@11] + java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Setup Java (temurin@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 - - - name: Cache sbt - uses: actions/cache@v2 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + java-version: 8 + cache: sbt - name: Check that workflows are up to date - run: sbt ++${{ matrix.scala }} githubWorkflowCheck + run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck - name: Build project - run: sbt ++${{ matrix.scala }} test + run: sbt '++ ${{ matrix.scala }}' test - name: Compress target directories run: tar cf targets.tar target slick-cats/target slick-cats-docs/target project/target - name: Upload target directories - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }} path: targets.tar @@ -73,35 +62,24 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.17] - java: [temurin@11] + java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Setup Java (temurin@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 - - - name: Cache sbt - uses: actions/cache@v2 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + java-version: 8 + cache: sbt - name: Download target directories (2.12.17) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-2.12.17-${{ matrix.java }} @@ -111,7 +89,7 @@ jobs: rm targets.tar - name: Download target directories (2.13.10) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-2.13.10-${{ matrix.java }} @@ -121,4 +99,4 @@ jobs: rm targets.tar - name: Publish project - run: sbt ++${{ matrix.scala }} +publish + run: sbt +publish diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index 547aaa4..bfc865d 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -17,6 +17,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Delete artifacts + shell: bash {0} run: | # Customize those three lines with your repository and credentials: REPO=${GITHUB_API_URL}/repos/${{ github.repository }} @@ -25,7 +26,7 @@ jobs: ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; } # A temporary file which receives HTTP response headers. - TMPFILE=/tmp/tmp.$$ + TMPFILE=$(mktemp) # An associative array, key: artifact name, value: number of artifacts of that name. declare -A ARTCOUNT diff --git a/.mergify.yml b/.mergify.yml index 127451b..59dc4e8 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -9,7 +9,8 @@ pull_request_rules: - author=scala-steward - author=slick-scala-steward[bot] - author=renovate[bot] - - check-success=Build and Test (ubuntu-latest, 2.12.17, temurin@11) - - check-success=Build and Test (ubuntu-latest, 2.13.10, temurin@11) + - check-success=Build and Test (ubuntu-latest, 2.12.17, temurin@8) + - check-success=Build and Test (ubuntu-latest, 2.13.10, temurin@8) actions: - queue: {} + queue: + name: default