refactor: fully rename git lookup hash to sha (#94)

sencrop · Jun 3, 2024 · d0c8271 · d0c8271
1 parent b019903
commit d0c8271
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/.github/workflows/ecs-deploy-v2.yml b/.github/workflows/ecs-deploy-v2.yml
@@ -103,17 +103,17 @@ jobs:
 
 
       - name: Get former version from Git
-        id: git_hash
+        id: git_sha
         if: "!inputs.use_version_as_docker_image_tag"
-        uses: sencrop/github-workflows/actions/lookup-git-hash@master
+        uses: sencrop/github-workflows/actions/lookup-git-sha@master
 
       - name: Notify deployment in progress
         uses: sencrop/github-workflows/actions/notify-deployment-in-progress@master
         with:
           service: ${{ inputs.service }}
           environment: ${{ inputs.environment }}
           dd_api_key: ${{ secrets.DD_API_KEY }}
-          former_version: ${{ steps.ecs_lookup.outputs.image_tag || steps.git_hash.outputs.previous }}
+          former_version: ${{ steps.ecs_lookup.outputs.image_tag || steps.git_sha.outputs.previous }}
           new_version: ${{ inputs.version }}
           slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
 

diff --git a/.github/workflows/version-v3.yml b/.github/workflows/version-v3.yml
@@ -18,8 +18,8 @@ jobs:
   version:
     runs-on: ubuntu-latest
     outputs:
-      version: ${{ steps.git_hash.outputs.REF || steps.git_tags.outputs.REF }}
-      previous_version: ${{ steps.git_hash.outputs.PREVIOUS_REF || steps.git_tags.outputs.PREVIOUS_REF }}
+      version: ${{ steps.git_sha.outputs.REF || steps.git_tag.outputs.REF }}
+      previous_version: ${{ steps.git_sha.outputs.PREVIOUS_REF || steps.git_tag.outputs.PREVIOUS_REF }}
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -31,19 +31,11 @@ jobs:
           [[ "${{ inputs.from }}" == "sha" ]] || [[ "${{ inputs.from }}" = "tag" ]]
 
       - name: Get version from git sha
+        id: git_sha
         if: inputs.from == 'sha'
-        id: git_hash
-        run: |
-          REF="$(git rev-parse --short HEAD)"
-          PREVIOUS_REF="$(git rev-parse --short HEAD~1)"
-          echo "REF=$REF" >> "${GITHUB_OUTPUT}"
-          echo "PREVIOUS_REF=$PREVIOUS_REF" >> "${GITHUB_OUTPUT}"
+        uses: sencrop/github-workflows/actions/lookup-git-sha@master
 
       - name: Get version from git tag
+        id: git_tag
         if: inputs.from == 'tag'
-        id: git_tags
-        run: |
-          REF="${GITHUB_REF#refs/tags/}"
-          PREVIOUS_REF="$(git tag -l 'v*' --sort=-v:refname | head -n2 | tail -n1)"
-          echo "REF=$REF" >> "${GITHUB_OUTPUT}"
-          echo "PREVIOUS_REF=$PREVIOUS_REF" >> "${GITHUB_OUTPUT}"
+        uses: sencrop/github-workflows/actions/lookup-git-tag@master
diff --git a/actions/lookup-git-hash/action.yaml → actions/lookup-git-sha/action.yaml b/actions/lookup-git-hash/action.yaml → actions/lookup-git-sha/action.yaml
@@ -1,11 +1,11 @@
 ---
-name: "Lookup git hash"
+name: "Lookup git sha"
 
 runs:
   using: "composite"
   steps:
-    - name: Lookup current and previous Git hash
-      id: git_hash
+    - name: Lookup current and previous Git sha
+      id: git_sha
       run: |
         REF="$(git rev-parse --short HEAD)"
         PREVIOUS_REF="$(git rev-parse --short HEAD~1)"