Merge remote-tracking branch 'origin/main' into release/0.1.2

# Conflicts: # pyproject.toml
podaac · Nov 25, 2024 · b705819 · b705819
2 parents bfe8198 1078d22
commit b705819
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/.github/workflows/cicd-pipeline.yml b/.github/workflows/cicd-pipeline.yml
@@ -121,8  121,14 @@ jobs:
           startsWith(github.ref, 'refs/heads/main') &&
           steps.manual.conclusion == 'skipped'
         id: release
         env:
           CURRENT_VERSION: ${{ steps.get-version.outputs.current_version }}
         # Remove rc* from end of version string
         # The ${string%%substring} syntax below deletes the longest match of $substring from back of $string.
         run: |
-          poetry version major
           poetry version ${CURRENT_VERSION%%rc*}
           echo "software_version=$(poetry version | awk '{print $2}')" >> $GITHUB_ENV
           echo "venue=ops" >> $GITHUB_ENV
           echo "TARGET_ENV_UPPERCASE=OPS" >> $GITHUB_ENV
       - name: Get install version
         # Get the version of the software being installed and save it as an ENV var