From b1a50d1648f34cf80d824ff429c3649c9253d8cc Mon Sep 17 00:00:00 2001 From: Dawid Dworak Date: Tue, 24 Dec 2024 09:22:20 +0100 Subject: [PATCH] Remove commons-redis from test suite --- .github/workflows/ci.yml | 10 ---------- install-redis.sh | 9 --------- project/Commons.scala | 16 +--------------- 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100755 install-redis.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84712a69b..ae8280730 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,6 @@ on: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - REDIS_VERSION: 6.2.12 jobs: build: @@ -52,12 +51,6 @@ jobs: - name: Setup sbt uses: sbt/setup-sbt@v1 - - name: Cache Redis - uses: actions/cache@v2 - with: - path: ./redis-${{ env.REDIS_VERSION }} - key: ${{ runner.os }}-redis-cache-v2-${{ env.REDIS_VERSION }} - - name: Setup Node.js uses: actions/setup-node@v2 with: @@ -69,9 +62,6 @@ jobs: mongodb-version: 7.0 mongodb-replica-set: test-rs - - name: Setup Redis - run: ./install-redis.sh - - name: Check that workflows are up to date run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck diff --git a/install-redis.sh b/install-redis.sh deleted file mode 100755 index 2b0784e61..000000000 --- a/install-redis.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -REDIS_HOME=$PWD/redis-$REDIS_VERSION/src -echo "REDIS_HOME=$REDIS_HOME" >> $GITHUB_ENV -if [ ! -d $REDIS_HOME ]; then - wget http://download.redis.io/releases/redis-$REDIS_VERSION.tar.gz - tar -xzf redis-$REDIS_VERSION.tar.gz - cd redis-$REDIS_VERSION && make BUILD_TLS=yes -fi - diff --git a/project/Commons.scala b/project/Commons.scala index 4b730116b..683678f13 100644 --- a/project/Commons.scala +++ b/project/Commons.scala @@ -73,20 +73,9 @@ object Commons extends ProjectGroup("commons") { githubWorkflowTargetTags ++= Seq("v*"), - githubWorkflowEnv ++= Map( - "REDIS_VERSION" -> "6.2.12", - ), githubWorkflowArtifactUpload := false, githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21")), githubWorkflowBuildPreamble ++= Seq( - WorkflowStep.Use( - UseRef.Public("actions", "cache", "v2"), - name = Some("Cache Redis"), - params = Map( - "path" -> "./redis-${{ env.REDIS_VERSION }}", - "key" -> "${{ runner.os }}-redis-cache-v2-${{ env.REDIS_VERSION }}" - ) - ), WorkflowStep.Use( UseRef.Public("actions", "setup-node", "v2"), name = Some("Setup Node.js"), @@ -100,10 +89,6 @@ object Commons extends ProjectGroup("commons") { "mongodb-replica-set" -> "test-rs", ) ), - WorkflowStep.Run( - List("./install-redis.sh"), - name = Some("Setup Redis"), - ) ), githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))), @@ -338,6 +323,7 @@ object Commons extends ProjectGroup("commons") { ), Test / parallelExecution := false, Compile / scalacOptions += "-Wconf:cat=deprecation:is", // only inform about deprecations due to scheduled removal + Test / skip := true, ) lazy val hocon = mkSubProject