Fix CML version on container images (#1460)

iterative · May 10, 2024 · f6e7833 · f6e7833
1 parent d9aa754
commit f6e7833
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
@@ -4,6 +4,9 @@ on:
  release:
  required: true
  type: boolean
+ version:
+ required: false
+ type: string
 jobs:
  images:
  runs-on: ubuntu-latest
@@ -33,8 +36,11 @@ jobs:
  fetch-depth: 0
  - name: Metadata
  id: metadata
+ env:
+ CML_VERSION: ${{ inputs.version }}
  run: |
  latest_tag=$(git describe --tags | cut -d- -f1)
+ test -n "$CML_VERSION" && latest_tag="$CML_VERSION"
  cml_version=${latest_tag##v}
  dvc_version=$(python3 -c '
  from distutils.version import StrictVersion as Ver

diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
@@ -98,6 +98,8 @@ jobs:
  packages:
  needs: [lint, test, test-os]
  runs-on: ubuntu-latest
+ outputs:
+ version: ${{ steps.publish.outputs.version }}
  steps:
  - uses: actions/checkout@v3
  with:
@@ -106,8 +108,10 @@ jobs:
  with:
  registry-url: https://registry.npmjs.org
  - run: npm install
- - run: |
+ - id: publish
+ run: |
  VERSION=$(jq -r .version < package.json)
+ echo "version=$VERSION" >> $GITHUB_OUTPUT
  npm install --dry-run @dvcorg/cml@$VERSION ||
  npm ${{ inputs.release && 'publish' || 'publish --dry-run' }}
  env:
@@ -133,3 +137,4 @@ jobs:
  uses: ./.github/workflows/images.yml
  with:
  release: ${{ inputs.release || false }}
+ version: ${{ needs.packages.outputs.version }}