Merge branch 'fix/service-name'

KyberNetwork · Jul 30, 2024 · f0b0d9d · f0b0d9d
2 parents f94d8fc + e53c394
commit f0b0d9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -77,7 +77,7 @@ jobs:
           labels: |
             kyber.network.schema-version=1.0
             kyber.network.name=${{ inputs.service }}
-            kyber.network.version=${{ steps.prepare.outputs.version_tag }}
+            kyber.network.version=${{ inputs.version }}
             kyber.network.vcs-ref=${{ github.sha }}
       - uses: docker/build-push-action@v6
         with:
@@ -86,7 +86,7 @@ jobs:
           build-args: |
             GH_USER=kyber-ci-bot
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.metadata.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}
           secrets: |
             "gh_pat=${{ secrets.GH_PAT }}"
           cache-from: type=gha

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -17,6 +17,9 @@ on:
         description: 'Service repo name'
         type: string
         required: true
+      service_name:
+        description: 'Service name. Default to service'
+        type: string
       version:
         description: 'Release version'
         type: string
@@ -66,8 +69,8 @@ jobs:
           git push origin "refs/tags/$VERSION"
       - uses: softprops/action-gh-release@v2
         with:
-          # token: ${{ secrets.GH_PAT }}
           tag_name: ${{ env.VERSION }}
           generate_release_notes: true
-          name: ${{ inputs.release_name }}
+          name: ${{ inputs.release_name ||
+              format('{0} {1}', inputs.service_name || inputs.service, env.VERSION) }}
           body: ${{ inputs.release_body }}