include distro in tag

mcenirm · May 22, 2024 · c543275 · c543275
1 parent b4ed6a9
commit c543275
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/release_new_rpm.yml b/.github/workflows/release_new_rpm.yml
@@ -39,6 +39,7 @@ jobs:
           ./respecit | xargs --no-run-if-empty git add
           echo "AWS_CLI_VERSION=$(cat aws-cli.version)" >> $GITHUB_ENV
           echo "AWSCLIV2_RPM_RELEASE=$(cat awscliv2-rpm.release)" >> $GITHUB_ENV
+          echo "AWSCLIV2_RPM_DISTRO=$(cat awscliv2-rpm.distro)" >> $GITHUB_ENV
 
       - name: Check for changes to commit
         id: check_for_changes
@@ -94,7 +95,7 @@ jobs:
         if: ${{ 'skipped' != steps.test_rpm.conclusion }}
         id: tag_for_release
         run: |
-          tag=v${AWS_CLI_VERSION}-${AWSCLIV2_RPM_RELEASE}
+          tag=v${AWS_CLI_VERSION}-${AWSCLIV2_RPM_RELEASE}.${AWSCLIV2_RPM_DISTRO}
           echo "tag=$tag" >> $GITHUB_OUTPUT
           git fetch -v --all --prune --prune-tags
           git checkout "$BASE_REF"

diff --git a/awscliv2-rpm.distro b/awscliv2-rpm.distro
@@ -0,0 +1 @@
+el8
diff --git a/respecit b/respecit
@@ -29,6 +29,10 @@ respec ${name}-rpm.release <<EOF
 ${release}
 EOF
 
+respec ${name}-rpm.distro <<EOF
+${distro}
+EOF
+
 respec ${name}.spec <<EOF
 Summary: AWS CLI version 2
 License: Apache License 2.0