Merge branch 'master' into newTimerApp

Screenly · Sep 14, 2024 · 3c0158c · 3c0158c
2 parents e696c35 + 3951884
commit 3c0158c
Show file tree

Hide file tree

Showing 49 changed files with 382 additions and 349 deletions.
diff --git a/.github/workflows/deploy-clock-app-qc.yml b/.github/workflows/deploy-clock-app-qc.yml
@@ -13,10 +13,8 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      APP_ID: '01HKT1XSC070BGNKYR7ZE689DE'
-      INSTALLATION_ID: '01HKT1YB1AQK79HQ5GF23F2ZAX'
-
       APP_PATH: 'edge-apps/clock'
+      MANIFEST_FILE_NAME: 'screenly_qc.yml'
 
     steps:
       - name: Checkout Code
@@ -27,18 +25,4 @@ jobs:
         with:
           screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
           # yamllint disable-line rule:line-length
-          cli_commands: edge-app upload --app-id=${{ env.APP_ID }} --path=${{ env.APP_PATH }}
-
-      - name: List Versions
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version list --app-id=${{ env.APP_ID }}
-
-      - name: Promote Edge App
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version promote --latest --installation-id=${{ env.INSTALLATION_ID }} --path=${{ env.APP_PATH }}
+          cli_commands: edge-app deploy --path=${{ env.APP_PATH }}
diff --git a/.github/workflows/deploy-clock-app.yml b/.github/workflows/deploy-clock-app.yml
@@ -8,9 +8,6 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      APP_ID: '01HKT2K8GVE8P6RE36QFKPG5G1'
-      INSTALLATION_ID: '01HKT2KZKZA270VKF3Z9PDKVJS'
-
       APP_PATH: 'edge-apps/clock'
 
     steps:
@@ -22,18 +19,4 @@ jobs:
         with:
           screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
           # yamllint disable-line rule:line-length
-          cli_commands: edge-app upload --app-id=${{ env.APP_ID }} --path=${{ env.APP_PATH }}
-
-      - name: List Versions
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version list --app-id=${{ env.APP_ID }}
-
-      - name: Promote Edge App
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version promote --latest --installation-id=${{ env.INSTALLATION_ID }} --path=${{ env.APP_PATH }}
+          cli_commands: edge-app deploy --path=${{ env.APP_PATH }}
diff --git a/.github/workflows/deploy-countdown-timer-qc.yml b/.github/workflows/deploy-countdown-timer-qc.yml
@@ -13,10 +13,8 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      APP_ID: '01HS8ZQP09W71PAMEZ65GH6SVV'
-      INSTALLATION_ID: '01HS8ZRGW789VHMJX3N2RVM794'
-
       APP_PATH: 'edge-apps/countdown-timer'
+      MANIFEST_FILE_NAME: 'screenly_qc.yml'
 
     steps:
       - name: Checkout Code
@@ -27,18 +25,4 @@ jobs:
         with:
           screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
           # yamllint disable-line rule:line-length
-          cli_commands: edge-app upload --app-id=${{ env.APP_ID }} --path=${{ env.APP_PATH }}
-
-      - name: List Versions
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version list --app-id=${{ env.APP_ID }}
-
-      - name: Promote Edge App
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version promote --latest --installation-id=${{ env.INSTALLATION_ID }} --path=${{ env.APP_PATH }}
+          cli_commands: edge-app deploy --path=${{ env.APP_PATH }}
diff --git a/.github/workflows/deploy-countdown-timer.yml b/.github/workflows/deploy-countdown-timer.yml
@@ -8,9 +8,6 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      APP_ID: '01HS8ZSEPGFZDKE606PD038TTB'
-      INSTALLATION_ID: '01HS8ZT7KNB3MB8EAC2YET8DB2'
-
       APP_PATH: 'edge-apps/countdown-timer'
 
     steps:
@@ -22,18 +19,4 @@ jobs:
         with:
           screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
           # yamllint disable-line rule:line-length
-          cli_commands: edge-app upload --app-id=${{ env.APP_ID }} --path=${{ env.APP_PATH }}
-
-      - name: List Versions
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version list --app-id=${{ env.APP_ID }}
-
-      - name: Promote Edge App
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version promote --latest --installation-id=${{ env.INSTALLATION_ID }} --path=${{ env.APP_PATH }}
+          cli_commands: edge-app deploy --path=${{ env.APP_PATH }}
diff --git a/.github/workflows/deploy-iframe-qc.yml b/.github/workflows/deploy-iframe-qc.yml
@@ -13,10 +13,8 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      APP_ID: '01HSGG4DJ6D2WE9GN0V7E4TSP1'
-      INSTALLATION_ID: '01HSGG5616M1JFA6Q0Z258NA4A'
-
       APP_PATH: 'edge-apps/iframe'
+      MANIFEST_FILE_NAME: 'screenly_qc.yml'
 
     steps:
       - name: Checkout Code
@@ -27,18 +25,4 @@ jobs:
         with:
           screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
           # yamllint disable-line rule:line-length
-          cli_commands: edge-app upload --app-id=${{ env.APP_ID }} --path=${{ env.APP_PATH }}
-
-      - name: List Versions
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version list --app-id=${{ env.APP_ID }}
-
-      - name: Promote Edge App
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version promote --latest --installation-id=${{ env.INSTALLATION_ID }} --path=${{ env.APP_PATH }}
+          cli_commands: edge-app deploy --path=${{ env.APP_PATH }}
diff --git a/.github/workflows/deploy-iframe.yml b/.github/workflows/deploy-iframe.yml
@@ -2,20 +2,18 @@
 name: Deploy iframe app
 
 on:
-  push:
-    branches:
-      - 'master'
-    paths:
-      - 'edge-apps/iframe/**'
-      - '.github/workflows/deploy-iframe.yml'
+  workflow_dispatch:
+#  push:
+#    branches:
+#      - 'master'
+#    paths:
+#      - 'edge-apps/iframe/**'
+#      - '.github/workflows/deploy-iframe.yml'
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      APP_ID: '01HSGGB40HC05XK0M1WDDVEHAH'
-      INSTALLATION_ID: '01HSGGBC6HSXYFEYPN8NJ88186'
-
       APP_PATH: 'edge-apps/iframe'
 
     steps:
@@ -27,18 +25,4 @@ jobs:
         with:
           screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
           # yamllint disable-line rule:line-length
-          cli_commands: edge-app upload --app-id=${{ env.APP_ID }} --path=${{ env.APP_PATH }}
-
-      - name: List Versions
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version list --app-id=${{ env.APP_ID }}
-
-      - name: Promote Edge App
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version promote --latest --installation-id=${{ env.INSTALLATION_ID }} --path=${{ env.APP_PATH }}
+          cli_commands: edge-app deploy --path=${{ env.APP_PATH }}
diff --git a/.github/workflows/deploy-power-bi-qc.yml b/.github/workflows/deploy-power-bi-qc.yml
@@ -13,10 +13,8 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      APP_ID: '01HRCAW49EW573V7JCH711SP5G'
-      INSTALLATION_ID: '01HRCAWQHXDAP5XZ53KZAP2SP7'
-
       APP_PATH: 'edge-apps/powerbi'
+      MANIFEST_FILE_NAME: 'screenly_qc.yml'
 
     steps:
       - name: Checkout Code
@@ -27,18 +25,4 @@ jobs:
         with:
           screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
           # yamllint disable-line rule:line-length
-          cli_commands: edge-app upload --app-id=${{ env.APP_ID }} --path=${{ env.APP_PATH }}
-
-      - name: List Versions
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version list --app-id=${{ env.APP_ID }}
-
-      - name: Promote Edge App
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version promote --latest --installation-id=${{ env.INSTALLATION_ID }} --path=${{ env.APP_PATH }}
+          cli_commands: edge-app deploy --path=${{ env.APP_PATH }}
diff --git a/.github/workflows/deploy-power-bi.yml b/.github/workflows/deploy-power-bi.yml
@@ -2,20 +2,18 @@
 name: Deploy Power BI
 
 on:
-  push:
-    branches:
-      - 'master'
-    paths:
-      - 'edge-apps/powerbi/**'
-      - '.github/workflows/deploy-power-bi.yml'
+  workflow_dispatch:
+#  push:
+#    branches:
+#      - 'master'
+#    paths:
+#      - 'edge-apps/powerbi/**'
+#      - '.github/workflows/deploy-power-bi.yml'
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      APP_ID: '01HRCB5Z5TZZFT6J37RNVQYC38'
-      INSTALLATION_ID: '01HRCBDACKA1DFNK5T1GZVX67D'
-
       APP_PATH: 'edge-apps/powerbi'
 
     steps:
@@ -27,18 +25,4 @@ jobs:
         with:
           screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
           # yamllint disable-line rule:line-length
-          cli_commands: edge-app upload --app-id=${{ env.APP_ID }} --path=${{ env.APP_PATH }}
-
-      - name: List Versions
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version list --app-id=${{ env.APP_ID }}
-
-      - name: Promote Edge App
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version promote --latest --installation-id=${{ env.INSTALLATION_ID }} --path=${{ env.APP_PATH }}
+          cli_commands: edge-app deploy --path=${{ env.APP_PATH }}
diff --git a/.github/workflows/deploy-rss-reader-qc.yml b/.github/workflows/deploy-rss-reader-qc.yml
@@ -13,9 +13,8 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      APP_ID: '01HKT59B49Z343B7C2H9JVH51B'
-      INSTALLATION_ID: '01HKT5CZ14CAB58SZ8EZ1NQMMH'
       APP_PATH: 'edge-apps/rss-reader'
+      MANIFEST_FILE_NAME: 'screenly_qc.yml'
 
     steps:
       - name: Checkout Code
@@ -32,18 +31,4 @@ jobs:
         with:
           screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
           # yamllint disable-line rule:line-length
-          cli_commands: edge-app upload --app-id=${{ env.APP_ID }} --path=${{ env.APP_PATH }}
-
-      - name: List Releases
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version list --app-id=${{ env.APP_ID }}
-
-      - name: Promote Edge App
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_AUTOMATED_QC }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version promote --latest --installation-id=${{ env.INSTALLATION_ID }} --path=${{ env.APP_PATH }}
+          cli_commands: edge-app deploy --path=${{ env.APP_PATH }}
diff --git a/.github/workflows/deploy-rss-reader.yml b/.github/workflows/deploy-rss-reader.yml
@@ -8,8 +8,6 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      APP_ID: '01HKT5KJPAHVGYJSFQF80BCJYQ'
-      INSTALLATION_ID: '01HKT5QZ2H4CZ0AHFTXVQ0BQ9A'
       APP_PATH: 'edge-apps/rss-reader'
 
     steps:
@@ -27,18 +25,4 @@ jobs:
         with:
           screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
           # yamllint disable-line rule:line-length
-          cli_commands: edge-app upload --app-id=${{ env.APP_ID }} --path=${{ env.APP_PATH }}
-
-      - name: List Releases
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version list --app-id=${{ env.APP_ID }}
-
-      - name: Promote Edge App
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version promote --latest --installation-id=${{ env.INSTALLATION_ID }} --path=${{ env.APP_PATH }}
+          cli_commands: edge-app deploy --path=${{ env.APP_PATH }}
diff --git a/.github/workflows/deploy-simple-message-app.yml b/.github/workflows/deploy-simple-message-app.yml
@@ -8,8 +8,6 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      APP_ID: '01HTYXDZVA532Z1GN4CX5Z7VH7'
-      INSTALLATION_ID: '01HTYXKF5Z6BCV7ZPB773K00Z1'
       APP_PATH: 'edge-apps/simple-message-app'
 
     steps:
@@ -21,18 +19,4 @@ jobs:
         with:
           screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
           # yamllint disable-line rule:line-length
-          cli_commands: edge-app upload --app-id=${{ env.APP_ID }} --path=${{ env.APP_PATH }}
-
-      - name: List Versions
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version list --app-id=${{ env.APP_ID }}
-
-      - name: Promote Edge App
-        uses: screenly/cli@master
-        with:
-          screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN_PRODUCTION }}
-          # yamllint disable-line rule:line-length
-          cli_commands: edge-app version promote --latest --installation-id=${{ env.INSTALLATION_ID }} --path=${{ env.APP_PATH }}
+          cli_commands: edge-app deploy --path=${{ env.APP_PATH }}