summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOran Agra <oran@redislabs.com>2022-04-13 09:15:10 +0300
committerOran Agra <oran@redislabs.com>2022-04-27 16:31:52 +0300
commit28d20b8f14343748e6d8069375d42ca218a1dc48 (patch)
tree47fb68e2a2835693a25ec265b12d3eb80a9b6113
parentba2feb30049c6663fc4c28cdbd829557bd43739a (diff)
downloadredis-28d20b8f14343748e6d8069375d42ca218a1dc48.tar.gz
Bring some CI adjustments from 7.0 into 6.2
-rw-r--r--.github/workflows/ci.yml9
-rw-r--r--.github/workflows/daily.yml5
-rwxr-xr-xruntest2
-rwxr-xr-xruntest-cluster2
-rwxr-xr-xruntest-moduleapi2
5 files changed, 12 insertions, 8 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 39b332a17..86ca4b3fb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,12 +19,15 @@ jobs:
- name: module api test
run: ./runtest-moduleapi --verbose
- build-ubuntu-old:
- runs-on: ubuntu-16.04
+ build-debian-old:
+ runs-on: ubuntu-latest
+ container: debian:oldoldstable
steps:
- uses: actions/checkout@v2
- name: make
- run: make REDIS_CFLAGS='-Werror'
+ run: |
+ apt-get update && apt-get install -y build-essential
+ make REDIS_CFLAGS='-Werror'
build-macos-latest:
runs-on: macos-latest
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 432971a9d..68e5711c8 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -247,16 +247,17 @@ jobs:
run: ./runtest-cluster
test-freebsd:
- runs-on: macos-latest
+ runs-on: macos-10.15
if: github.repository == 'redis/redis'
timeout-minutes: 14400
steps:
- uses: actions/checkout@v2
- name: test
- uses: vmactions/freebsd-vm@v0.1.4
+ uses: vmactions/freebsd-vm@v0.1.6
with:
usesh: true
sync: rsync
+ copyback: false
prepare: pkg install -y bash gmake lang/tcl86
run: >
gmake &&
diff --git a/runtest b/runtest
index ade1bd09a..88617c1a6 100755
--- a/runtest
+++ b/runtest
@@ -1,5 +1,5 @@
#!/bin/sh
-TCL_VERSIONS="8.5 8.6"
+TCL_VERSIONS="8.5 8.6 8.7"
TCLSH=""
for VERSION in $TCL_VERSIONS; do
diff --git a/runtest-cluster b/runtest-cluster
index a86e93141..e465ce186 100755
--- a/runtest-cluster
+++ b/runtest-cluster
@@ -1,5 +1,5 @@
#!/bin/sh
-TCL_VERSIONS="8.5 8.6"
+TCL_VERSIONS="8.5 8.6 8.7"
TCLSH=""
for VERSION in $TCL_VERSIONS; do
diff --git a/runtest-moduleapi b/runtest-moduleapi
index d6374766f..532c722bb 100755
--- a/runtest-moduleapi
+++ b/runtest-moduleapi
@@ -1,5 +1,5 @@
#!/bin/sh
-TCL_VERSIONS="8.5 8.6"
+TCL_VERSIONS="8.5 8.6 8.7"
TCLSH=""
[ -z "$MAKE" ] && MAKE=make