Skip to content

Commit 12e7ec7

Browse files
committed
ci: update tarantool version
1 parent c27a441 commit 12e7ec7

File tree

3 files changed

+10
-15
lines changed

3 files changed

+10
-15
lines changed

.github/workflows/publish.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
version-check:
1010
# We need this job to run only on push with tag.
1111
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
12-
runs-on: ubuntu-24.04
12+
runs-on: ubuntu-22.04
1313
steps:
1414
- name: Check module version
1515
uses: tarantool/actions/check-module-version@master
@@ -18,7 +18,7 @@ jobs:
1818

1919
publish-scm-1:
2020
if: github.ref == 'refs/heads/master'
21-
runs-on: ubuntu-24.04
21+
runs-on: ubuntu-22.04
2222
steps:
2323
- uses: actions/checkout@v4
2424
- uses: tarantool/rocks.tarantool.org/github-action@master
@@ -29,13 +29,13 @@ jobs:
2929
publish-tag:
3030
if: startsWith(github.ref, 'refs/tags/')
3131
needs: version-check
32-
runs-on: ubuntu-24.04
32+
runs-on: ubuntu-22.04
3333
steps:
3434
- uses: actions/checkout@v4
3535

3636
- uses: tarantool/setup-tarantool@v3
3737
with:
38-
tarantool-version: '2.10'
38+
tarantool-version: '2.11'
3939
- run: echo $PWD/.rocks/bin >> $GITHUB_PATH
4040

4141
# Make a release

.github/workflows/test_on_push.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push]
44

55
jobs:
66
all:
7-
runs-on: ubuntu-24.04
7+
runs-on: ubuntu-22.04
88
timeout-minutes: 10
99
env:
1010
DOWNLOAD_TOKEN: ${{ secrets.DOWNLOAD_TOKEN }}
@@ -19,12 +19,14 @@ jobs:
1919
- name: Checkout sources
2020
uses: actions/checkout@v4
2121

22-
- name: Install sdk
23-
run: make sdk
22+
- name: Install tarantool
23+
uses: tarantool/setup-tarantool@v3
24+
with:
25+
tarantool-version: '2.11'
2426

2527
- name: Install rocks
2628
shell: bash
27-
run: source sdk/env.sh && make .rocks
29+
run: make .rocks
2830

2931
- name: Run tests
3032
run: make test

Makefile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,11 @@ version := scm-1
22

33
.PHONY: all doc test schema install
44

5-
BUNDLE_VERSION=2.8.4-0-g47e6bd362-r508
65
COMMIT_TAG = $(shell git describe)
76

87
all: doc
98
mkdir -p doc
109

11-
sdk: Makefile
12-
wget https://tarantool:$(DOWNLOAD_TOKEN)@download.tarantool.io/enterprise/tarantool-enterprise-bundle-$(BUNDLE_VERSION).tar.gz
13-
tar -xzf tarantool-enterprise-bundle-$(BUNDLE_VERSION).tar.gz
14-
rm tarantool-enterprise-bundle-$(BUNDLE_VERSION).tar.gz
15-
mv tarantool-enterprise sdk
16-
1710
.rocks: migrations-scm-1.rockspec
1811
$(shell) ./deps.sh
1912

0 commit comments

Comments
 (0)