From ee4f0c5af7756a2e3fa63d2d34b4894be8e9abb4 Mon Sep 17 00:00:00 2001 From: Vitah Lin Date: Thu, 28 Nov 2024 21:59:43 +0800 Subject: [PATCH] Deprecate ubuntu lunar and macos-12 in workflows (#13669) 1. Ubuntu Lunar reached End of Life on January 25, 2024, so upgrade the ubuntu version to plucky in action `test-ubuntu-jemalloc-fortify` to pass the daily CI 2. The macOS-12 environment is deprecated so upgrade macos-12 to macos-13 in daily CI --------- Co-authored-by: debing.sun --- .github/workflows/daily.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 38d86b24a..20c6cf55e 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -76,7 +76,6 @@ jobs: if: | (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'redis/redis')) && !contains(github.event.inputs.skipjobs, 'fortify') - container: ubuntu:lunar timeout-minutes: 14400 steps: - name: prep @@ -94,11 +93,10 @@ jobs: ref: ${{ env.GITHUB_HEAD_REF }} - name: make run: | - apt-get update && apt-get install -y make gcc-13 - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 + apt-get update && apt-get install -y make gcc make CC=gcc REDIS_CFLAGS='-Werror -DREDIS_TEST -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3' - name: testprep - run: apt-get install -y tcl8.6 tclx procps + run: sudo apt-get install -y tcl8.6 tclx procps - name: test if: true && !contains(github.event.inputs.skiptests, 'redis') run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}} @@ -873,7 +871,7 @@ jobs: run: ./runtest-cluster ${{github.event.inputs.cluster_test_args}} test-freebsd: - runs-on: macos-12 + runs-on: macos-13 if: | (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'redis/redis')) && !contains(github.event.inputs.skipjobs, 'freebsd') && !(contains(github.event.inputs.skiptests, 'redis') && contains(github.event.inputs.skiptests, 'modules')) @@ -909,7 +907,7 @@ jobs: if echo "${{github.event.inputs.skiptests}}" | grep -vq modules ; then ./runtest-moduleapi --verbose --timeout 2400 --no-latency --dump-logs ${{github.event.inputs.test_args}} ; fi test-freebsd-sentinel: - runs-on: macos-12 + runs-on: macos-13 if: | (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'redis/redis')) && !contains(github.event.inputs.skipjobs, 'freebsd') && !contains(github.event.inputs.skiptests, 'sentinel') @@ -941,7 +939,7 @@ jobs: if echo "${{github.event.inputs.skiptests}}" | grep -vq sentinel ; then ./runtest-sentinel ${{github.event.inputs.cluster_test_args}} ; fi test-freebsd-cluster: - runs-on: macos-12 + runs-on: macos-13 if: | (github.event_name == 'workflow_dispatch' || (github.event_name != 'workflow_dispatch' && github.repository == 'redis/redis')) && !contains(github.event.inputs.skipjobs, 'freebsd') && !contains(github.event.inputs.skiptests, 'cluster')