From b8f21db3cc5e4b0e51a2ceebf2becac998d665b8 Mon Sep 17 00:00:00 2001 From: Ryan McGinty Date: Fri, 6 Dec 2024 12:11:54 -0800 Subject: [PATCH] Add VERSION_TAG output to release workflow and update author email in pyproject.toml --- .github/workflows/release.yml | 7 +++++-- pyproject.toml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e072ff9..aceba07 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,6 +34,7 @@ jobs: MAJOR_VERSION: ${{ steps.get-version-and-commit-sha.outputs.MAJOR_VERSION }} MINOR_VERSION: ${{ steps.get-version-and-commit-sha.outputs.MINOR_VERSION }} PATCH_VERSION: ${{ steps.get-version-and-commit-sha.outputs.PATCH_VERSION }} + VERSION_TAG: ${{ steps.get-version-and-commit-sha.outputs.VERSION_TAG }} COMMIT_SHA: ${{ steps.get-version-and-commit-sha.outputs.COMMIT_SHA }} steps: - name: Checkout @@ -80,7 +81,8 @@ jobs: echo "PATCH_VERSION=$patch_version" >> $GITHUB_OUTPUT short_version="$major_version.$minor_version" echo "SHORT_VERSION=$short_version" >> $GITHUB_OUTPUT - commit_sha=$(git rev-parse $latest_tag) + echo "VERSION_TAG=$latest_tag" >> $GITHUB_OUTPUT + commit_sha=$(git rev-list -n 1 $latest_tag) echo "COMMIT_SHA=$commit_sha" >> $GITHUB_OUTPUT - name: Show version run: | @@ -89,6 +91,7 @@ jobs: echo MAJOR_VERSION: ${{ steps.get-version-and-commit-sha.outputs.MAJOR_VERSION }} echo MINOR_VERSION: ${{ steps.get-version-and-commit-sha.outputs.MINOR_VERSION }} echo PATCH_VERSION: ${{ steps.get-version-and-commit-sha.outputs.PATCH_VERSION }} + echo VERSION_TAG: ${{ steps.get-version-and-commit-sha.outputs.VERSION_TAG }} echo COMMIT_SHA: ${{ steps.get-version-and-commit-sha.outputs.COMMIT_SHA }} build: @@ -99,7 +102,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ needs.bump.outputs.COMMIT_SHA }} + ref: ${{ needs.bump.outputs.VERSION_TAG }} - name: Set up Python ${{ github.event.inputs.python-version }} uses: actions/setup-python@v4 with: diff --git a/pyproject.toml b/pyproject.toml index abcd5b6..4626923 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ build-backend = "hatchling.build" # ----------------------------------------------------------------------------- [project] name = "aibs-informatics-test-resources" -authors = [{ name = "AIBS Informatics Group"}] +authors = [{ name = "AIBS Informatics Group", email = "marmot@alleninstitute.onmicrosoft.com"}] maintainers = [{ name = "AIBS Informatics Group", email = "marmot@alleninstitute.onmicrosoft.com"}] description = "unit test resources for AIBS informatics packages" readme = { file = "README.md", content-type = "text/markdown" }