diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml index 4eba378..51cea1f 100644 --- a/.github/workflows/pull-requests.yml +++ b/.github/workflows/pull-requests.yml @@ -11,7 +11,7 @@ jobs: validate-samples: name: ${{ matrix.framework }} / ${{ matrix.language }} / ${{ matrix.buildtool }} - runs-on: ubuntu-latest + runs-on: Akka-Default-Latest strategy: fail-fast: false matrix: @@ -26,8 +26,8 @@ jobs: framework: akka buildtool: sbt steps: - - uses: actions/checkout@v2 - - uses: actions/cache@v2 + - uses: actions/checkout@v4 + - uses: actions/cache@v4 env: cache-name: ${{ matrix.framework }}-dependencies-cache-${{ matrix.language }} with: @@ -37,10 +37,12 @@ jobs: ~/.sbt ~/.cache/coursier/v1 key: ${{ runner.os }}-${{ matrix.framework }}-${{ env.cache-name }} - - uses: AdoptOpenJDK/install-jdk@v1 + - uses: actions/setup-java@v4 name: Install AdoptOpenJDK 11 with: version: "11" + - name: Run akka/github-actions-scripts + uses: akka/github-actions-scripts/setup_global_resolver@main - name: docker-compose up run: | pushd ${{ matrix.framework }}/shopping-cart-${{ matrix.language }} && docker-compose up -d && popd diff --git a/akka/shopping-cart-java/pom.xml b/akka/shopping-cart-java/pom.xml index 2347514..201699a 100644 --- a/akka/shopping-cart-java/pom.xml +++ b/akka/shopping-cart-java/pom.xml @@ -27,11 +27,6 @@ - - akka-repository - Akka library repository - https://repo.akka.io/maven - lightbend-commercial Lightbend Commercial diff --git a/akka/shopping-cart-scala/build.sbt b/akka/shopping-cart-scala/build.sbt index adcce3d..659c1ed 100644 --- a/akka/shopping-cart-scala/build.sbt +++ b/akka/shopping-cart-scala/build.sbt @@ -47,8 +47,6 @@ dockerUpdateLatest := true ThisBuild / dynverSeparator := "-" -resolvers += "Akka library repository".at("https://repo.akka.io/maven") - libraryDependencies ++= Seq( // 1. Basic dependencies for a clustered application "com.typesafe.akka" %% "akka-stream" % AkkaVersion,