Skip to content

Commit

Permalink
ci: fixes
Browse files Browse the repository at this point in the history
	* etcd image was updated to v3.5.16
	* setup-tarantool was switched to @master
	* strategy/fail-fast was disabled for matrix
  • Loading branch information
ochaton committed Sep 12, 2024
1 parent a8fae9f commit 384b663
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push-rockspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags')
steps:
- uses: actions/checkout@master
- uses: tarantool/setup-tarantool@v3
- uses: tarantool/setup-tarantool@master
with:
tarantool-version: '2.6'

Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: tarantool/setup-tarantool@v2
- uses: tarantool/setup-tarantool@master
with:
tarantool-version: '2.10.7'
- name: install luacheck 0.26.0
Expand All @@ -21,6 +21,7 @@ jobs:
run-unit-tests:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
version: ["1.10.15", "2.8.4", "2.10.6", "2.10.7-gc64-amd64", "2.11.0", "2.11.1"]
steps:
Expand All @@ -39,7 +40,7 @@ jobs:
needs: ["run-unit-tests"]
steps:
- uses: actions/checkout@master
- uses: tarantool/setup-tarantool@v2
- uses: tarantool/setup-tarantool@master
with:
tarantool-version: '2.10.7'
- name: install luacov-coveralls 0.2.3
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ config-test-%: config-test-builder run-etcd
docker build -t $(@) --build-arg IMAGE=$(subst config-test-,,$@) -f Dockerfile.test .

test-%: config-test-%
docker run --name $(<) \
docker run --rm --name $(<) \
--net tt_net \
-e TT_ETCD_ENDPOINTS="http://etcd0:2379,http://etcd1:2379,http://etcd2:2379" \
--rm -v $$(pwd):/source/config \
-v $$(pwd):/source/config \
-v $$(pwd)/data:/tmp/ \
--workdir /source/config \
--entrypoint '' \
Expand Down
6 changes: 1 addition & 5 deletions config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -992,11 +992,7 @@ local M
-- Moreover, first run of box.cfg in the life of the process allows to specify static box.cfg options, such as pid_file, log
-- and many others.
-- But, second reconfiguration of box.cfg (due to reload, or reconfiguration in fencing must never touch static options)
-- Part of this is fixed in `do_cfg` method of this codebase. But! Tarantool is buggy, so some options such as `log` appears to
-- be dynamic (it is listed in load_cfg.dynamic_cfg) but in practices log is static option.

-- do_cfg calls under the hood first_cfg or redo_cfg based on type of `box.cfg` (when function -- then it is first_cfg,
-- otherwise -- redo_cfg).
-- Part of this is fixed in `do_cfg` method of this codebase.

-- Because many wrappers in docker-entrypoint.lua and tarantoolctl LOVES to perform non-redoable actions inside box.cfg and
-- switch box.cfg back to builtin tarantool box.cfg, following code MUST NEVER cache value of box.cfg
Expand Down
4 changes: 1 addition & 3 deletions test/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3"

x-env: &env
ETCDCTL_API: 2
ETCD_ENABLE_V2: true
Expand All @@ -9,7 +7,7 @@ x-env: &env
ETCD_INITIAL_CLUSTER: etcd0=http://etcd0:2380,etcd1=http://etcd1:2380,etcd2=http://etcd2:2380

x-etcd: &etcd
image: quay.io/coreos/etcd:v3.3.11
image: quay.io/coreos/etcd:v3.5.16
networks:
- tarantool

Expand Down

0 comments on commit 384b663

Please sign in to comment.