From 32b0c03b2267cdbd2e9c038fd1682f41440ac9e1 Mon Sep 17 00:00:00 2001 From: nicomiguelino Date: Thu, 3 Sep 2026 17:21:35 -0700 Subject: [PATCH] Use EDGE_APP_ID for stage and production deploys - Set STAGE_EDGE_APP_ID and PRODUCTION_EDGE_APP_ID repo variables and pass them through to the initialize/update actions as edge_app_id - Drop id from screenly.yml and delete screenly_qc.yml since a single manifest is now used regardless of environment - Pin edge-apps-actions to a commit for now, since v26.9.0 can't be tagged there until a repo ruleset is adjusted --- .github/workflows/initialize-edge-app.yml | 3 +- .github/workflows/update-edge-app.yml | 6 +- screenly.yml | 1 - screenly_qc.yml | 80 ----------------------- 4 files changed, 6 insertions(+), 84 deletions(-) delete mode 100644 screenly_qc.yml diff --git a/.github/workflows/initialize-edge-app.yml b/.github/workflows/initialize-edge-app.yml index 29fce8e..48932f3 100644 --- a/.github/workflows/initialize-edge-app.yml +++ b/.github/workflows/initialize-edge-app.yml @@ -32,9 +32,10 @@ jobs: - uses: actions/checkout@v7 with: ref: ${{ inputs.environment == 'production' && 'main' || github.ref }} - - uses: Screenly/edge-apps-actions/initialize@v1 + - uses: Screenly/edge-apps-actions/initialize@f4ccd2bd50db5fb0a5147d287ac03cafe552d29b with: screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN }} edge_app_name: ${{ inputs.edge_app_name }} edge_app_title: ${{ inputs.edge_app_title }} environment: ${{ inputs.environment }} + edge_app_id: ${{ secrets.EDGE_APP_ID || (inputs.environment == 'production' && vars.PRODUCTION_EDGE_APP_ID || (inputs.environment == 'stage' && vars.STAGE_EDGE_APP_ID)) }} diff --git a/.github/workflows/update-edge-app.yml b/.github/workflows/update-edge-app.yml index 78b8baa..703f032 100644 --- a/.github/workflows/update-edge-app.yml +++ b/.github/workflows/update-edge-app.yml @@ -18,11 +18,12 @@ jobs: environment: stage steps: - uses: actions/checkout@v7 - - uses: Screenly/edge-apps-actions/update@v1 + - uses: Screenly/edge-apps-actions/update@f4ccd2bd50db5fb0a5147d287ac03cafe552d29b with: screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN }} environment: stage delete_missing_settings: 'true' + edge_app_id: ${{ secrets.EDGE_APP_ID || vars.STAGE_EDGE_APP_ID }} deploy-production: name: Updating Cap Alerting App in production @@ -31,8 +32,9 @@ jobs: environment: production steps: - uses: actions/checkout@v7 - - uses: Screenly/edge-apps-actions/update@v1 + - uses: Screenly/edge-apps-actions/update@f4ccd2bd50db5fb0a5147d287ac03cafe552d29b with: screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN }} environment: production delete_missing_settings: 'true' + edge_app_id: ${{ secrets.EDGE_APP_ID || vars.PRODUCTION_EDGE_APP_ID }} diff --git a/screenly.yml b/screenly.yml index dd7efb7..1d040a9 100644 --- a/screenly.yml +++ b/screenly.yml @@ -1,6 +1,5 @@ --- syntax: manifest_v1 -id: 01KFZKEHAHSJZWC7SW0A7N6CWS description: Display CAP emergency alerts on Screenly screens. Supports offline mode and uses screen tags (e.g., exit:North Lobby) to highlight the nearest exit. icon: https://playground.srly.io/edge-apps/cap-alerting/static/cap-icon.svg author: Screenly, Inc. diff --git a/screenly_qc.yml b/screenly_qc.yml deleted file mode 100644 index 9710c50..0000000 --- a/screenly_qc.yml +++ /dev/null @@ -1,80 +0,0 @@ ---- -syntax: manifest_v1 -id: 01KFZ2Y0D5TJV1YEBGM2N9D8JY -description: Display CAP emergency alerts on Screenly screens. Supports offline mode and uses screen tags (e.g., exit:North Lobby) to highlight the nearest exit. -icon: https://playground.srly.io/edge-apps/cap-alerting/static/cap-icon.svg -author: Screenly, Inc. -entrypoint: - type: file -ready_signal: true -categories: - - Utilities -settings: - cap_feed_url: - type: string - default_value: '' - title: CAP Feed URL - optional: false - help_text: - properties: - help_text: URL or relative path to a CAP XML feed. - type: string - schema_version: 1 - display_errors: - type: string - default_value: 'false' - title: Display Errors - optional: true - help_text: - properties: - advanced: true - help_text: For debugging purposes to display errors on the screen. - type: boolean - schema_version: 1 - language: - type: string - default_value: en - title: Default Language - optional: true - help_text: - properties: - help_text: Choose the preferred language when multiple info blocks exist (e.g., en, es, fr). - type: string - schema_version: 1 - max_alerts: - type: string - default_value: Infinity - title: Maximum Alerts - optional: true - help_text: - properties: - help_text: Maximum number of alerts to display simultaneously. - type: number - schema_version: 1 - mode: - type: string - default_value: production - title: Mode - optional: true - help_text: - properties: - help_text: Select the operation mode for the app. - options: - - label: Production - value: production - - label: Demo - value: demo - - label: Test - value: test - type: select - schema_version: 1 - refresh_interval: - type: string - default_value: '5' - title: Refresh Interval (minutes) - optional: true - help_text: - properties: - help_text: Time in minutes between feed updates. - type: number - schema_version: 1