Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
awownysz-splunk committed Dec 19, 2023
1 parent 3f7a009 commit 595324c
Showing 1 changed file with 5 additions and 17 deletions.
22 changes: 5 additions & 17 deletions .github/actions/meta/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ outputs:
# using fromJSON as below gave an error `error reading JToken from JsonReader` - hence using jq
# value: ghcr.io/${{ github.repository }}/container:${{ fromJSON(steps.docker_action_meta.outputs.json).labels['org.opencontainers.image.version'] }}
# https://github.com/splunk/splunk-add-on-for-microsoft-cloud-services/actions/runs/7019443167/job/19104471863#step:7:4
value: ghcr.io/${{ github.repository }}/container:${{ steps.docker_meta_outputs.outputs.sc4s_version }}
value: ghcr.io/${{ github.repository }}/container:$(echo '${{ steps.docker_action_meta.outputs.json }}' | jq -r '.labels["org.opencontainers.image.version"]')
container_tags:
value: ${{ steps.docker_action_meta.outputs.tags }}
container_labels:
value: ${{ steps.docker_action_meta.outputs.labels }}
container_buildtime:
value: ${{ steps.docker_meta_outputs.outputs.container_buildtime }}
value: $(echo '${{ steps.docker_action_meta.outputs.json }}' | jq -r '.labels["org.opencontainers.image.created"]')
container_version:
value: ${{ steps.docker_meta_outputs.outputs.container_version }}
value: $(echo '${{ steps.docker_action_meta.outputs.json }}' | jq -r '.labels["org.opencontainers.image.version"]')
container_revision:
value: ${{ steps.docker_meta_outputs.outputs.container_revision }}
value: $(echo '${{ steps.docker_action_meta.outputs.json }}' | jq -r '.labels["org.opencontainers.image.revision"]')
container_base:
value: ${{ steps.docker_meta_outputs.outputs.container_base }}
value: $(echo '${{ steps.docker_action_meta.outputs.json }}' | jq -r '.tags[0]')
matrix_supportedSplunk:
value: ${{ steps.matrix.outputs.supportedSplunk }}
matrix_latestSplunk:
Expand Down Expand Up @@ -84,18 +84,6 @@ runs:
type=ref,event=branch
type=ref,event=pr
- name: Set Docker meta outputs
id: docker_meta_outputs
shell: bash
# echo 'sc4s_version=${{ steps.docker_action_meta.outputs.json }}' | jq -r '.labels["org.opencontainers.image.version"]' >> "$GITHUB_OUTPUT"
run: |
outputs_json=${{ steps.docker_action_meta.outputs.json }}
echo 'sc4s_version=$outputs_json' | jq -r '.labels["org.opencontainers.image.version"]' >> "$GITHUB_OUTPUT"
echo 'container_buildtime=${{ steps.docker_action_meta.outputs.json }}' | jq -r '.labels["org.opencontainers.image.created"]' >> "$GITHUB_OUTPUT"
echo 'container_version=${{ steps.docker_action_meta.outputs.json }}' | jq -r '.labels["org.opencontainers.image.version"]' >> "$GITHUB_OUTPUT"
echo 'container_revision=${{ steps.docker_action_meta.outputs.json }}' | jq -r '.labels["org.opencontainers.image.revision"]' >> "$GITHUB_OUTPUT"
echo 'container_base=${{ steps.docker_action_meta.outputs.json }}' | jq -r '.tags[0]' >> "$GITHUB_OUTPUT"
- name: matrix
id: matrix
uses: splunk/[email protected]
Expand Down

0 comments on commit 595324c

Please sign in to comment.