Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: add tarantool 3.0 CI #675

Merged
merged 2 commits into from
Nov 8, 2023
Merged

CI: add tarantool 3.0 CI #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
112aa0f
rocks: improve lua include dir detection
psergee Nov 8, 2023
500d4ac
ci: add tarantool 3.0 CI
psergee Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion .github/actions/prepare-ce-test-env/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,26 @@ runs:
shell: bash

- name: Install Tarantool
if: |
inputs.skip-tarantool-install == 'false' &&
!startsWith(inputs.tarantool-version, '3.')
uses: tarantool/setup-tarantool@v1
if: ${{ inputs.skip-tarantool-install == 'false' }}
with:
tarantool-version: '${{ inputs.tarantool-version }}'

# Here is a workaround for Tarantool 3.0 installation until it is supported
# by setup-tarantool. This step will install the latest pre-released
# Tarantool 3.0 from repository.
- name: Install Tarantool from repo
if: |
inputs.skip-tarantool-install == 'false' &&
startsWith(inputs.tarantool-version, '3.')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have two questions/suggestions:

  • Do I understand correctly that in case of 3.0 the latest 3.0 release (alpha, beta or ...) will be installed?
  • I suggest adding a comment that curl ... is a temporary trick until we can't use the setup-tarantool action, and it will be replaced in the future

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Answered in the comment in the action code.

run: |
sudo curl -L https://tarantool.io/iqJapRm/release/3/installer.sh | \
sed 's|repo_type="release"|repo_type="pre-release"|' | bash
sudo apt install tarantool tarantool-dev
shell: bash

- name: Install etcd
uses: ./.github/actions/setup-etcd
if: ${{ inputs.skip-etcd-install == 'false' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/full-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
tarantool-version: ["1.10", "2.10"]
tarantool-version: ["1.10", "2.10", "3.0"]
fail-fast: false
steps:
- uses: actions/checkout@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
tarantool-version: ["1.10", "2.10"]
tarantool-version: ["1.10", "2.10", "3.0"]
fail-fast: false
steps:
- uses: actions/checkout@master
Expand Down
8 changes: 8 additions & 0 deletions cli/rocks/rocks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const (
rocksRepoManifestName = "manifest"
repoRocksPathEnvVarName = "TT_CLI_REPO_ROCKS"
tarantoolPrefixEnvVarName = "TT_CLI_TARANTOOL_PREFIX"
tarantoolDefaultPrefixDir = "/usr"
LeonidVas marked this conversation as resolved.
Show resolved Hide resolved
)

// addLuarocksRepoOpts adds --server option to luarocks command line if rocks repository
Expand Down Expand Up @@ -94,6 +95,13 @@ func GetTarantoolPrefix(cli *cmdcontext.CliCtx, cliOpts *config.CliOpts) (string
}

prefixDir := matches["prefix"]

if !util.IsDir(prefixDir) {
log.Debugf("%q does not exist or is not a directory. Using default: %q",
prefixDir, tarantoolDefaultPrefixDir)
prefixDir = tarantoolDefaultPrefixDir
}

log.Debugf("Tarantool prefix path: %q", prefixDir)
return prefixDir, nil
}
Expand Down