revert changes with to output steps as json as well as redundant output with sha2

This commit is contained in:
2026-01-21 12:02:24 +01:00
parent 03db29128d
commit 3f72d59491

View File

@@ -4,43 +4,40 @@ on:
workflow_call: workflow_call:
inputs: inputs:
dockerfile: dockerfile:
description: 'Path to Dockerfile' description: "Path to Dockerfile"
required: true required: true
type: string type: string
context: context:
description: 'Build context' description: "Build context"
default: '.' default: "."
required: false required: false
image: image:
description: 'Where to store the built image' description: "Where to store the built image"
required: true required: true
type: string type: string
submodules: submodules:
description: 'Submodules pull strategy' description: "Submodules pull strategy"
default: 'recursive' default: "recursive"
required: false required: false
type: string type: string
user: user:
description: 'Git user for checkout' description: "Git user for checkout"
default: 'automation' default: "automation"
required: false required: false
type: string type: string
token: token:
description: 'Git token for checkout' description: "Git token for checkout"
required: true required: true
type: string type: string
outputs: outputs:
tag: tag:
description: 'Built image tag' description: "Built image tag"
value: ${{ jobs.build.outputs.tag }} value: ${{ jobs.build.outputs.tag }}
image: image:
description: 'Built image name' description: "Built image name"
value: ${{ jobs.build.outputs.image }} value: ${{ jobs.build.outputs.image }}
sha: sha:
description: 'Git SHA used for the build' description: "Git SHA used for the build"
value: ${{ jobs.build.outputs.sha }}
sha2:
description: 'Git SHA used for the build'
value: ${{ jobs.build.outputs.sha }} value: ${{ jobs.build.outputs.sha }}
jobs: jobs:
build: build:
@@ -81,13 +78,7 @@ jobs:
id: facts id: facts
run: | run: |
echo "sha=${{ gitea.event.release.target_commitish }}" >> $GITHUB_OUTPUT echo "sha=${{ gitea.event.release.target_commitish }}" >> $GITHUB_OUTPUT
- name: Visa build outputs och validera
run: |
echo "outputs från steps:"
echo '${{ toJSON(steps) }}'
echo " "
outputs: outputs:
tag: ${{ fromJSON(steps.meta.outputs.json).tags[0] }} tag: ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
image: ${{ inputs.image }} image: ${{ inputs.image }}
sha: ${{ gitea.sha }} sha: ${{ gitea.sha }}
sha2: ${{ steps.facts.outputs.sha }}