diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e8e5648..abf8ab5e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,29 +21,26 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/checkout@v2 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'adopt' + - name: Set up sbt + uses: sbt/setup-sbt@v1 + + - name: Validation + run: sbt validate + - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v4 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') }} - - - name: Validation - run: sbt validate - + key: ${{ runner.os }}-sbt-cache-v4-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} diff --git a/build.sbt b/build.sbt index c0152dfe..37023e63 100644 --- a/build.sbt +++ b/build.sbt @@ -418,7 +418,7 @@ def dockerCompose( env: String = "" ) = { val upCommand = if (upOrDown) "up -d" else "down" - s"docker-compose --env-file ./.env$env $upCommand" ! + s"docker compose --env-file ./.env$env $upCommand" ! } lazy val noPublishing = Seq(publish / skip := true)