Skip to content

Commit 3926bd3

Browse files
committed
Improve integration workflow
1 parent 73fa72c commit 3926bd3

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.github/actions/run-tests/action.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ runs:
3939
run: |
4040
set -e
4141
42+
echo "::group::Setup Environment variables and run Redis"
4243
dotnet_major_minor_version=$(echo "${{ inputs.dotnet-version }}" | grep -oP '^\d+\.\d+')
4344
echo "CLR_VERSION=net${dotnet_major_minor_version}" >> $GITHUB_ENV
4445
@@ -50,9 +51,9 @@ runs:
5051
5152
# Mapping of redis version to stack version
5253
declare -A redis_stack_version_mapping=(
53-
["7.4.1"]="rs-7.4.0-v1"
54-
["7.2.6"]="rs-7.2.0-v13"
55-
["6.2.16"]="rs-6.2.6-v17"
54+
["7.4.1"]="rs-7.4.0-v2"
55+
["7.2.6"]="rs-7.2.0-v14"
56+
["6.2.16"]="rs-6.2.6-v18"
5657
)
5758
5859
if [[ -v redis_stack_version_mapping[$REDIS_VERSION] ]]; then
@@ -71,7 +72,8 @@ runs:
7172
echo "Using redis CE for module tests"
7273
export CLIENT_LIBS_TEST_IMAGE="redislabs/client-libs-test:$REDIS_VERSION"
7374
docker compose --profile all -f tests/dockers/docker-compose.yml up -d --build
74-
fi
75+
fi
76+
echo "::endgroup::"
7577
shell: bash
7678

7779
# Make sure only the desired dotnet version is set both as target and as active SDK.
@@ -101,10 +103,12 @@ runs:
101103
- name: Test
102104
shell: bash
103105
run: |
106+
echo "::group::Run tests"
104107
echo "${{inputs.REDIS_CA_PEM}}" > tests/NRedisStack.Tests/bin/Debug/${CLR_VERSION}/redis_ca.pem
105108
echo "${{inputs.REDIS_USER_CRT}}" > tests/NRedisStack.Tests/bin/Debug/${CLR_VERSION}/redis_user.crt
106109
echo "${{inputs.REDIS_USER_PRIVATE_KEY}}" > tests/NRedisStack.Tests/bin/Debug/${CLR_VERSION}/redis_user_private.key
107110
dotnet test -f ${CLR_VERSION} --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover -p:BuildInParallel=false tests/Test.proj --logger GitHubActions
111+
echo "::endgroup::"
108112
- name: Codecov
109113
uses: codecov/codecov-action@v4
110114
with:
@@ -118,6 +122,7 @@ runs:
118122
working-directory: PackageVerification
119123
shell: bash
120124
run: |
125+
echo "::group::Test against Nuget package from local source"
121126
mkdir -p test-source
122127
dotnet nuget add source $(readlink -f test-source) -n test-source
123128
find .. -name '*.nupkg' | xargs -I {} dotnet nuget push {} -s test-source
@@ -127,4 +132,5 @@ runs:
127132
find . -name '*.csproj' | xargs -I {} sed -E -i 's|<TargetFrameworks(.*)>.*</TargetFrameworks>|<TargetFramework\1>${CLR_VERSION}</TargetFramework>|' {}
128133
dotnet restore -s test-source -v detailed
129134
dotnet run
135+
echo "::endgroup::"
130136

.github/workflows/integration.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ concurrency:
1717

1818
env:
1919
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
20-
REDIS_IMAGE: redis:latest
21-
REDIS_STACK_IMAGE: redis/redis-stack-server:latest
2220
CURRENT_REDIS_VERSION: '7.4.1'
2321

2422
jobs:

0 commit comments

Comments
 (0)