Skip to content

Commit

Permalink
style: apply auto-formatting using prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
jnsgruk committed Dec 5, 2023
1 parent a87d810 commit 799843a
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 18 deletions.
6 changes: 3 additions & 3 deletions call-for-testing/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ runs:
uses: actions/download-artifact@v3
with:
name: "manifests"

- name: Setup snapcraft
shell: bash
run: |
sudo snap install snapcraft --classic
- name: Find the snapcraft.yaml path
id: yaml-path
shell: bash
Expand Down Expand Up @@ -129,7 +129,7 @@ runs:
shell: bash
run: |
wget -qO template.md "https://raw.githubusercontent.com/${{ inputs.ci-repo }}/main/call-for-testing/template.md"
- name: Create call for testing issue
uses: JasonEtco/create-an-issue@v2
id: issue
Expand Down
2 changes: 1 addition & 1 deletion get-architectures/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ runs:
run: |
# Get the list as a json array. E.g. ["amd64", "arm64"]
architectures_list="$(cat "$yaml_path" | yq -r -I=0 -o=json '[.architectures[]]')"
# Get the list as a space-separated string. E.g. "amd64" "arm64"
architectures="$(cat "$yaml_path" | yq -r -I=0 -o=csv '[.architectures[]]' | tr ',' ' ')"
Expand Down
4 changes: 2 additions & 2 deletions get-screenshots/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ runs:
uses: actions/download-artifact@v3
with:
name: manifests

- name: Find the snapcraft.yaml path
id: yaml-path
shell: bash
Expand Down Expand Up @@ -116,7 +116,7 @@ runs:
- name: Checkout screenshots repo
uses: actions/checkout@v4
with:
with:
repository: ${{ inputs.screenshots-repo }}
path: ci-screenshots
token: ${{ inputs.screenshots-token }}
Expand Down
4 changes: 2 additions & 2 deletions promote-to-stable/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ runs:
shell: bash
run: |
sudo snap install --classic snapcraft
- name: Find the snapcraft.yaml path
id: yaml-path
shell: bash
Expand Down Expand Up @@ -70,7 +70,7 @@ runs:
shell: bash
run: |
echo "The command was '${{ steps.command.outputs.command-name }}' with arguments '${{ steps.command.outputs.command-arguments }}'"
arguments=(${{ steps.command.outputs.command-arguments }})
revision=${arguments[0]}
channel=${arguments[1]}
Expand Down
10 changes: 4 additions & 6 deletions release-to-candidate/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ inputs:
description: "A token with permissions to upload to the specified channel"
required: true


outputs:
revision:
description: "The revision of the uploaded snap"
Expand All @@ -50,7 +49,7 @@ runs:
- name: Find the snapcraft.yaml path
id: yaml-path
shell: bash
run : |
run: |
if [[ -n "${{ inputs.snapcraft-yaml-path }}" ]]; then
yaml_path="${{ inputs.snapcraft-yaml-path }}"
else
Expand All @@ -74,15 +73,14 @@ runs:
echo "yaml-path=${yaml_path}" >> "$GITHUB_OUTPUT"
echo "snap-name=$(yq -r '.name' "$yaml_path")" >> "$GITHUB_OUTPUT"
- name: Build the snap (${{ inputs.architecture }})
id: build
shell: bash
env:
yaml_path: ${{ steps.yaml-path.outputs.yaml-path }}
name: ${{ steps.yaml-path.outputs.snap-name }}
arch: ${{ inputs.architecture }}
run : |
run: |
# Remove the architecture definition from the snapcraft.yaml due to:
# https://bugs.launchpad.net/snapcraft/+bug/1885150
yq -i 'del(.architectures)' "$yaml_path"
Expand All @@ -108,7 +106,7 @@ runs:
shell: bash
env:
yaml_path: ${{ steps.yaml-path.outputs.yaml-path }}
run : |
run: |
# Populate defaults
echo "classic=false" >> "$GITHUB_OUTPUT"
Expand All @@ -120,7 +118,7 @@ runs:
# Declare the common locations for plugs/slots declarations
plugs_files=("plug-declaration.json" ".github/plug-declaration.json")
slots_files=("slot-declaration.json" ".github/slot-declaration.json")
for file in "${plugs_files[@]}"; do
if [[ -f "$file" ]]; then
echo "plugs=$file" >> "$GITHUB_OUTPUT"
Expand Down
8 changes: 4 additions & 4 deletions test-snap-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ inputs:
default: "false"
required: false
snapcraft-yaml-path:
description: "Custom path to snapcraft.yaml for when it is not in the default location."
description: "Custom path to snapcraft.yaml for when it is not in the default location."
required: false

runs:
Expand Down Expand Up @@ -50,14 +50,14 @@ runs:
uses: snapcore/action-build@v1
id: build
with:
path: ${{ steps.yaml-path.outputs.yaml-path }}
path: ${{ steps.yaml-path.outputs.yaml-path }}

- name: Parse snap review information
id: parse
shell: bash
env:
yaml_path: ${{ steps.yaml-path.outputs.yaml-path }}
run : |
run: |
# Populate defaults
echo "classic=false" >> "$GITHUB_OUTPUT"
Expand All @@ -69,7 +69,7 @@ runs:
# Declare the common locations for plugs/slots declarations
plugs_files=("plug-declaration.json" ".github/plug-declaration.json")
slots_files=("slot-declaration.json" ".github/slot-declaration.json")
for file in "${plugs_files[@]}"; do
if [[ -f "$file" ]]; then
echo "plugs=$file" >> "$GITHUB_OUTPUT"
Expand Down

0 comments on commit 799843a

Please sign in to comment.