Skip to content

Ensure tags are fetched prior to determining the version #116

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

Merged
merged 7 commits into from
Apr 10, 2025
Merged

Ensure tags are fetched prior to determining the version #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0488520
Upload nightly builds and release builds to pypi
dagardner-nv Apr 10, 2025
b92d203
Create a unique alpha tag for the nightly builds
dagardner-nv Apr 10, 2025
8e90925
Merge branch 'develop' of github.com:NVIDIA/AgentIQ into david-nightl…
dagardner-nv Apr 10, 2025
5b82529
Fetch tags to avoid the fallback no-tag
dagardner-nv Apr 10, 2025
176214d
get the git tag early
dagardner-nv Apr 10, 2025
8087df9
Source the common.sh script, and get the git version early
dagardner-nv Apr 10, 2025
ae8ebc8
Merge branch 'develop' of github.com:NVIDIA/AgentIQ into david-nightl…
dagardner-nv Apr 10, 2025
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
10 changes: 7 additions & 3 deletions ci/scripts/gitlab/artifactory_upload.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
# Exit on error
set -e

GITLAB_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

source ${GITLAB_SCRIPT_DIR}/common.sh

# change this to ready to publish. this should be done programmatically once
# the release process is finalized.
if [[ "${CI_CRON_NIGHTLY}" == "true" || "${CI_COMMIT_BRANCH}" == "main" ]]; then
Expand All @@ -35,6 +39,9 @@ WHEELS_DIR="${CI_PROJECT_DIR}/.tmp/wheels"
EXCLUDE_SUBDIRS=("examples")
COMPONENT_NAME="agentiq"

GIT_TAG=$(get_git_tag)
rapids-logger "Git Version: ${GIT_TAG}"

# Exit if required secrets are not set
if [[ -z "${URM_USER}" || -z "${URM_API_KEY}" ]]; then
echo "Error: URM_USER or URM_API_KEY is not set. Exiting."
Expand Down Expand Up @@ -77,9 +84,6 @@ function install_jfrog_cli() {
}
install_jfrog_cli

GIT_TAG=$(get_git_tag)
rapids-logger "Git Version: ${GIT_TAG}"

# Upload wheels if enabled
if [[ "${UPLOAD_TO_ARTIFACTORY}" == "true" ]]; then
for SUBDIR in $(find "${WHEELS_DIR}" -mindepth 1 -maxdepth 1 -type d); do
Expand Down
7 changes: 4 additions & 3 deletions ci/scripts/gitlab/build_wheel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ set -e
GITLAB_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

source ${GITLAB_SCRIPT_DIR}/common.sh
WHEELS_DIR=${CI_PROJECT_DIR}/.tmp/wheels

create_env extra:all

GIT_TAG=$(get_git_tag)
rapids-logger "Git Version: ${GIT_TAG}"

WHEELS_DIR=${CI_PROJECT_DIR}/.tmp/wheels

create_env extra:all

function build_wheel() {
rapids-logger "Building Wheel for $1"
uv build --wheel --no-progress --out-dir "${WHEELS_DIR}/$2" --directory $1
Expand Down
2 changes: 2 additions & 0 deletions ci/scripts/gitlab/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ AIQ_EXAMPLES=($(find ./examples/ -maxdepth 2 -name "pyproject.toml" | sort | xar
AIQ_PACKAGES=($(find ./packages/ -maxdepth 2 -name "pyproject.toml" | sort | xargs dirname))

function get_git_tag() {
FT=$(git fetch --all --tags)

# Get the latest Git tag, sorted by version, excluding lightweight tags
GIT_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "no-tag")

Expand Down