diff --git a/gitlab/README.md b/gitlab/README.md index 3dea7a8ce..ac30d512c 100644 --- a/gitlab/README.md +++ b/gitlab/README.md @@ -1,5 +1,5 @@ ## Gitlab Pipelines -There are 5 Greenlight packaged binaries/libraries that are published - 2 Python packages and 3 Rust crates. +There are 5 Greenlight packaged binaries/libraries that are published - 1 Python packages and 4 Rust crates. The builds are triggered by certain tag formats. Make sure to include a patch as well since the Rust compiler requires that (applicable to `gl-client-py` as well). @@ -11,9 +11,9 @@ If a tagged release doesn't work, it can be retried by adding an `_N` suffix aft ### PyPI * gl-client-py - `glclientpy_YYYYMMDD-x.x.x` -* greenlight-cli - `glcli_YYYYMMDD-x.x.x` ### crates.io * gl-client - `glclient_YYYYMMDD-x.x.x` * gl-plugin - `glplugin_YYYYMMDD-x.x.x` * gl-signerproxy - `glsignerproxy_YYYYMMDD-x.x.x` +* gl-cli -`glcli_YYYYMMDD-x.x.x` diff --git a/gitlab/build-crates.yml b/gitlab/build-crates.yml index 29619c3fb..5db19fa0a 100644 --- a/gitlab/build-crates.yml +++ b/gitlab/build-crates.yml @@ -33,3 +33,10 @@ build_gl_signerproxy: - if: $CI_COMMIT_TAG =~ /glsignerproxy_\d{8}(_[1-9][0-9]?)?\-.*/ variables: PKG_NAME: gl-signerproxy + +build_gl_cli: + extends: .build_rust_prep + rules: + - if: $CI_COMMIT_TAG =~ /glcli_\d{8}(_[1-9][0-9]?)?\-.*/ + variables: + PKG_NAME: gl-cli diff --git a/gitlab/build-pypi.yml b/gitlab/build-pypi.yml index 4cf2f970d..a0e84d09d 100644 --- a/gitlab/build-pypi.yml +++ b/gitlab/build-pypi.yml @@ -17,23 +17,3 @@ build_gl_client_py: expire_in: 2 weeks paths: - "target/wheels/*" - -build_glcli: - extends: .build_setup - when: manual - rules: - - if: $CI_COMMIT_TAG =~ /glcli_\d{8}(_[1-9][0-9]?)?\-.*/ - before_script: - - export NEW_VER=$(echo ${CI_COMMIT_TAG} | cut -d'-' -f2) - - sed -i "s/^version = \".*\"/version = \"$NEW_VER\"/" tools/glcli/pyproject.toml - - . $HOME/.cargo/env # sh doesn't have the correct PATH - script: - - cd tools/glcli - - poetry config pypi-token.pypi ${PYPI_TOKEN} - - poetry build - - poetry publish - - ls -lh dist - artifacts: - expire_in: 2 weeks - paths: - - "tools/glcli/dist/*"