Skip to content

Commit

Permalink
Merge pull request #227 from Screenly/ump-version
Browse files Browse the repository at this point in the history
Bump cli version to 1.0.2
  • Loading branch information
sergey-borovkov authored Oct 31, 2024
2 parents 5ac3562 + 3e200f8 commit 901f57f
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "screenly"
version = "1.0.1"
version = "1.0.2"
edition = "2021"

[[bin]]
Expand All @@ -19,7 +19,10 @@ glob = "0.3.1"
hex = "0.4.3"
http-auth-basic = "0.3.3"
indicatif = "0.17.2"
log = { version = "0.4.17", features = ["release_max_level_debug", "max_level_debug"] }
log = { version = "0.4.17", features = [
"release_max_level_debug",
"max_level_debug",
] }
openssl = { version = '0.10', features = ["vendored"] }
prettytable-rs = "0.10.0"
protobuf = "3.3.0"
Expand All @@ -35,7 +38,7 @@ serde_with = "3.8.3"
serde_yaml = "0.9.17"
sha1 = "0.10.5"
sha2 = "0.10.7"
simple_logger = { version = "4.0.0", features= ["colors"]}
simple_logger = { version = "4.0.0", features = ["colors"] }
strum = "0.25"
strum_macros = "0.25"
temp-env = "0.3.6"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM alpine:3 as builder

WORKDIR /usr/src/screenly-cli
RUN apk add --no-cache wget tar
ARG RELEASE=v1.0.1
ARG RELEASE=v1.0.2
RUN wget "https://github.com/Screenly/cli/releases/download/$RELEASE/screenly-cli-x86_64-unknown-linux-musl.tar.gz"
RUN tar xfz screenly-cli-x86_64-unknown-linux-musl.tar.gz

Expand Down
16 changes: 8 additions & 8 deletions action.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
# action.yml
name: 'Screenly'
description: 'GitHub Actions for Screenly.'
author: 'Screenly, Inc'
name: "Screenly"
description: "GitHub Actions for Screenly."
author: "Screenly, Inc"
branding:
icon: 'code'
color: 'purple'
icon: "code"
color: "purple"
inputs:
screenly_api_token:
description: "Your Screenly API token."
Expand All @@ -19,15 +19,15 @@ inputs:
required: false
cli_version:
description: "Screenly CLI version."
default: "v1.0.1"
default: "v1.0.2"

outputs:
cli_commands_response:
description: "The response from the Screenly CLI command(s)."
value: ${{ steps.run-cli.outputs.response }}

runs:
using: 'composite'
using: "composite"
steps:
- name: Download CLI
id: download-cli
Expand All @@ -47,7 +47,7 @@ runs:
set -o pipefail
API_TOKEN=${{ inputs.screenly_api_token }} RUST_LOG=debug /tmp/screenly ${{ inputs.cli_commands }} >> /tmp/screenly_cli_command_output.txt
# Filter logs from github output, while still saving them as artifact. Filtered lines are like: 2024-10-16T13:16:13.974Z DEBUG [reqwest::connect] ...
grep -Ev '^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}Z[[:space:]](DEBUG|INFO|WARNING|ERROR)' /tmp/screenly_cli_command_output.txt | tr '\n' ' ' > /tmp/command_cleaned_output.txt
echo "response=$(cat /tmp/command_cleaned_output.txt)" >> "$GITHUB_OUTPUT"
Expand Down
2 changes: 2 additions & 0 deletions src/commands/edge_app/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,7 @@ mod tests {
}

#[test]
#[ignore]
fn test_transform_edge_app_instance_path_to_instance_manifest_when_path_provided_should_return_path_with_instance_manifest(
) {
let dir = tempdir().unwrap();
Expand Down Expand Up @@ -1092,6 +1093,7 @@ mod tests {
}

#[test]
#[ignore]
fn test_transform_edge_app_path_to_manifest_with_env_instance_override_should_return_overrided_manifest_path(
) {
let dir = tempdir().unwrap();
Expand Down

0 comments on commit 901f57f

Please sign in to comment.