Skip to content

Commit

Permalink
gh-actions/github/context: Minor fix (#974)
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Northey <[email protected]>
  • Loading branch information
phlax authored Nov 7, 2023
1 parent 53f9f4c commit e7fb7bb
Show file tree
Hide file tree
Showing 16 changed files with 42 additions and 41 deletions.
6 changes: 3 additions & 3 deletions gh-actions/docker/cache/prime/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ outputs:
runs:
using: "composite"
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
if: ${{ inputs.lock-app-id && inputs.lock-app-key }}
name: Fetch app auth
id: appauth
with:
app_id: ${{ inputs.lock-app-id }}
key: ${{ inputs.lock-app-key }}
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].25
if: ${{ steps.appauth.outputs.token || inputs.lock-token }}
with:
key: ${{ inputs.lock-id || inputs.image_tag }}
repository: ${{ inputs.lock-repository }}
token: ${{ steps.appauth.outputs.token || inputs.lock-token }}
- uses: envoyproxy/toolshed/gh-actions/cache/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/cache/[email protected].25
id: prime
with:
key: "${{ inputs.image_tag }}"
Expand Down
2 changes: 1 addition & 1 deletion gh-actions/docker/cache/restore/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ inputs:
runs:
using: "composite"
steps:
- uses: envoyproxy/toolshed/gh-actions/cache/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/cache/[email protected].25
with:
key: ${{ inputs.image_tag }}
command: |
Expand Down
2 changes: 1 addition & 1 deletion gh-actions/docker/fetch/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ inputs:
runs:
using: "composite"
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
id: fetch
with:
url: ${{ inputs.url }}
Expand Down
6 changes: 3 additions & 3 deletions gh-actions/docker/shas/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ outputs:
runs:
using: composite
steps:
- uses: envoyproxy/toolshed/gh-actions/yaml/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/yaml/[email protected].25
id: yaml
with:
yaml: ${{ inputs.images }}
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
id: json_actions
with:
input: ${{ steps.yaml.outputs.json }}
filter: |
{runs: {using: "composite", steps: [to_entries[] | {
uses: "envoyproxy/toolshed/gh-actions/docker/[email protected].24",
uses: "envoyproxy/toolshed/gh-actions/docker/[email protected].25",
id: .key,
with: {
image: .value,
Expand Down
6 changes: 3 additions & 3 deletions gh-actions/github/check/start/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ outputs:
runs:
using: composite
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: Print checks
with:
input: ${{ inputs.checks }}
options: -C
print-result: true
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: App auth
id: appauth
with:
Expand All @@ -43,7 +43,7 @@ runs:
env:
GH_TOKEN: ${{ steps.appauth.outputs.token }}
CHECKS: ${{ inputs.checks }}
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: Checks
id: checks
with:
Expand Down
4 changes: 2 additions & 2 deletions gh-actions/github/check/update/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ outputs:
runs:
using: composite
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: App auth
id: appauth
with:
Expand All @@ -36,7 +36,7 @@ runs:
env:
INPUT: ${{ inputs.data }}
GH_TOKEN: ${{ steps.appauth.outputs.token }}
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: Print check response
with:
input: ${{ steps.progress.outputs.response }}
Expand Down
10 changes: 5 additions & 5 deletions gh-actions/github/checkout/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@ runs:
steps:
- name: Fetch token for app auth
id: appauth
uses: envoyproxy/toolshed/gh-actions/[email protected].24
uses: envoyproxy/toolshed/gh-actions/[email protected].25
if: ${{ inputs.app_id && inputs.app_key }}
with:
app_id: ${{ inputs.app_id }}
key: ${{ inputs.app_key }}
- name: Parse YAML config
id: parsed
uses: envoyproxy/toolshed/gh-actions/yaml/[email protected].24
uses: envoyproxy/toolshed/gh-actions/yaml/[email protected].25
with:
yaml: ${{ inputs.config || '{}' }}
- name: Add auth token to config
id: config
if: ${{ steps.appauth.outputs.token }}
uses: envoyproxy/toolshed/gh-actions/[email protected].24
uses: envoyproxy/toolshed/gh-actions/[email protected].25
with:
input: ${{ steps.parsed.outputs.json }}
filter: |
Expand All @@ -58,15 +58,15 @@ runs:
- name: Remove ref
id: updated-config-noref
if: ${{ inputs.ref-is-ancestor && toJSON(steps.config.outputs.value).ref }}
uses: envoyproxy/toolshed/gh-actions/[email protected].24
uses: envoyproxy/toolshed/gh-actions/[email protected].25
with:
input: ${{ steps.config.outputs.value }}
filter: |
| del(.ref)
- name: Set fetch-depth if required
id: updated-config
if: ${{ steps.updated-config-noref.outputs.value && contains(fromJSON('[1, "1", ""]'), toJSON(steps.config.outputs.value).fetch-depth) }}
uses: envoyproxy/toolshed/gh-actions/[email protected].24
uses: envoyproxy/toolshed/gh-actions/[email protected].25
with:
input: ${{ steps.updated-config-noref.outputs.value }}
filter: |
Expand Down
15 changes: 8 additions & 7 deletions gh-actions/github/context/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,16 @@ inputs:
runs:
using: composite
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: Config
id: config
with:
input: ${{ inputs.resources }}
format: text
options: -Rs
filter: |
split("\n") | map(select(length > 0))
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: Print github
if: ${{ contains(fromJSON(steps.config.outputs.value), 'github') }}
with:
Expand All @@ -42,35 +43,35 @@ runs:
use-tmp-file: true
filter: |
del(.token)
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: Print runner
if: ${{ contains(fromJSON(steps.config.outputs.value), 'runner') }}
with:
input: ${{ toJSON(runner) }}
options: -C
print-result: true
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: Print job
if: ${{ contains(fromJSON(steps.config.outputs.value), 'job') }}
with:
input: ${{ inputs.job || toJSON(job) }}
options: -C
print-result: true
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: Print env
if: ${{ contains(fromJSON(steps.config.outputs.value), 'env') }}
with:
input: ${{ inputs.env || toJSON(env) }}
options: -C
print-result: true
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: Print env
if: ${{ contains(fromJSON(steps.config.outputs.value), 'needs') && inputs.needs }}
with:
input: ${{ inputs.needs }}
options: -C
print-result: true
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: Print env
if: ${{ contains(fromJSON(steps.config.outputs.value), 'vars') && inputs.vars }}
with:
Expand Down
8 changes: 4 additions & 4 deletions gh-actions/github/env/load/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ outputs:
runs:
using: composite
steps:
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/github/[email protected].25
name: Github context
- name: Download environment data
id: download
uses: envoyproxy/toolshed/gh-actions/github/artifact/[email protected].24
uses: envoyproxy/toolshed/gh-actions/github/artifact/[email protected].25
with:
name: ${{ inputs.name }}
path: ${{ runner.temp }}
Expand All @@ -32,14 +32,14 @@ runs:
DATA=$(cat ${{ runner.temp }}/${{ inputs.name }}.json)
printf 'data=%s' "${DATA}" >> $GITHUB_OUTPUT
shell: bash
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
id: toenv
with:
input: ${{ steps.data.outputs.data }}
options: -r
filter: |
to_entries[] | .key + "=" + (.value | tostring)
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: Print env data
with:
input: ${{ steps.data.outputs.value }}
Expand Down
2 changes: 1 addition & 1 deletion gh-actions/github/env/save/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ inputs:
runs:
using: composite
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: Print check proxy data
with:
input: ${{ inputs.env }}
Expand Down
4 changes: 2 additions & 2 deletions gh-actions/github/env/save/action.yml~
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ runs:
steps:
- name: Download environment data
id: download
uses: envoyproxy/toolshed/gh-actions/github/artifact/[email protected].24
uses: envoyproxy/toolshed/gh-actions/github/artifact/[email protected].25
with:
name: env
path: ${{ runner.temp }}
Expand All @@ -27,7 +27,7 @@ runs:
DATA=$(cat ${{ runner.temp }}/env.json)
echo "data=${DATA}" >> $GITHUB_OUTPUT
shell: bash
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
id: toenv
with:
input: ${{ steps.data.outputs.data }}
Expand Down
2 changes: 1 addition & 1 deletion gh-actions/github/merge-commit/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ runs:
shell: bash
env:
URL: https://api.github.com/repos/${{ inputs.repository }}/pulls/${{ inputs.pr }}
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
id: jq
with:
input: ${{ steps.fetch.outputs.response }}
Expand Down
2 changes: 1 addition & 1 deletion gh-actions/github/pr/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ runs:
working-directory: ${{ inputs.working-directory }}
shell: bash
- name: Upload diff
uses: envoyproxy/toolshed/gh-actions/upload/[email protected].24
uses: envoyproxy/toolshed/gh-actions/upload/[email protected].25
if: ${{ inputs.diff-upload }}
with:
diff: HEAD^1
Expand Down
10 changes: 5 additions & 5 deletions gh-actions/github/run/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@ runs:
steps:
- if: ${{ fromJSON(inputs.diskspace-hack) }}
name: Free diskspace
uses: envoyproxy/toolshed/gh-actions/[email protected].24
uses: envoyproxy/toolshed/gh-actions/[email protected].25
with:
to_remove: ${{ inputs.diskskpack-hack-paths }}
- uses: envoyproxy/toolshed/gh-actions/using/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/using/[email protected].25
name: Pre report
if: ${{ inputs.report-pre }}
with:
steps: ${{ inputs.report-pre }}
- uses: envoyproxy/toolshed/gh-actions/using/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/using/[email protected].25
name: Run pre steps
if: ${{ inputs.steps-pre }}
with:
Expand Down Expand Up @@ -158,13 +158,13 @@ runs:
shell: bash
env:
INPUT_ENV: ${{ inputs.source }}
- uses: envoyproxy/toolshed/gh-actions/using/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/using/[email protected].25
name: Run post steps
if: ${{ inputs.steps-post }}
with:
name: ${{ inputs.steps-post-name }}
steps: ${{ inputs.steps-post }}
- uses: envoyproxy/toolshed/gh-actions/using/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/using/[email protected].25
name: Post report
if: ${{ inputs.report-post }}
with:
Expand Down
2 changes: 1 addition & 1 deletion gh-actions/json/table/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ outputs:
runs:
using: composite
steps:
- uses: envoyproxy/toolshed/gh-actions/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/[email protected].25
name: Generate table
id: table
with:
Expand Down
2 changes: 1 addition & 1 deletion gh-actions/using/recurse/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ runs:
steps:
# .tmp.action/action.yml **must** be hardcoded

- uses: envoyproxy/toolshed/gh-actions/yaml/[email protected].24
- uses: envoyproxy/toolshed/gh-actions/yaml/[email protected].25
id: yaml
with:
yaml: ${{ inputs.with }}
Expand Down

0 comments on commit e7fb7bb

Please sign in to comment.