Release: version 0.6.1

tsukumijima · Nov 16, 2022 · aaf2587 · aaf2587
1 parent 7fc1cb0
commit aaf2587
Show file tree

Hide file tree

Showing 21 changed files with 43 additions and 18 deletions.
diff --git a/.github/workflows/build_installer.yaml b/.github/workflows/build_installer.yaml
@@ -5,6 +5,8 @@ name: Build Installer
 # .github/workflows/build_installer.yaml (このファイル) に変更があったとき or 手動実行
 on:
   push:
+    branches:
+      - master
     paths:
       - 'installer/**'
       - '.github/workflows/build_installer.yaml'

diff --git a/.github/workflows/build_thirdparty.yaml b/.github/workflows/build_thirdparty.yaml
@@ -4,6 +4,8 @@ name: Build Thirdparty Libraries
 # .github/workflows/build_thirdparty.yaml (このファイル) に変更があったとき or 手動実行
 on:
   push:
+    branches:
+      - master
     paths:
       - '.github/workflows/build_thirdparty.yaml'
   workflow_call:

diff --git a/.github/workflows/publish_docker_image.yaml b/.github/workflows/publish_docker_image.yaml
@@ -18,16 +18,23 @@ env:
 jobs:
   build-and-push-image:
     runs-on: ubuntu-latest
+    if: (startsWith(github.ref, 'refs/tags/v')) || (contains(github.event.head_commit.message, 'Release:') == false)
     permissions:
       contents: read
       packages: write
     steps:
+
       - name: Checkout Repository
         uses: actions/checkout@v3
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2
 
+      - name: Wait for Release to be Created
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: |
+          sleep 180s
+
       # GitHub Container Registry (ghcr.io) にログイン
       - name: Login to the Container Registry
         uses: docker/login-action@v2

diff --git a/.github/workflows/publish_release.yaml b/.github/workflows/publish_release.yaml
@@ -30,12 +30,21 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
 
+      # KonomiTV のソースコードをチェックアウト
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          path: KonomiTV
+          token: ${{ secrets.GIT_PUSH_TOKEN }}
+
       # release ブランチを現在の master ブランチの最新コミットに更新し、push する
       ## release ブランチはリリースしたときのみ更新される
       - name: Update Release Branch
+        working-directory: KonomiTV
         run: |
-          git clone https://github.com/tsukumijima/KonomiTV.git
-          cd KonomiTV
+          git config user.name github-actions
+          git config user.email [email protected]
           git switch release
           git merge master
           git push
@@ -64,7 +73,6 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           artifacts: "KonomiTV-Installer.exe,KonomiTV-Installer.elf,thirdparty-windows.7z,thirdparty-linux.tar.xz"
-          draft: true
           generateReleaseNotes: true
           name: KonomiTV (β) ${{ github.event.inputs.version }}
           tag: v${{ github.event.inputs.version }}
diff --git a/Dockerfile b/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends aria2 ca-certif
 # サードパーティーライブラリをダウンロード
 ## サードパーティーライブラリは変更が少ないので、先にダウンロード処理を実行してビルドキャッシュを効かせる
 WORKDIR /
-RUN aria2c -x10 https://github.com/tsukumijima/KonomiTV/releases/download/v0.6.0/thirdparty-linux.tar.xz
+RUN aria2c -x10 https://github.com/tsukumijima/KonomiTV/releases/download/v0.6.1/thirdparty-linux.tar.xz
 RUN tar xvf thirdparty-linux.tar.xz
 
 # --------------------------------------------------------------------------------------------------------------

diff --git a/Readme.md b/Readme.md
@@ -310,7 +310,7 @@ Docker Compose は V1 と V2 の両方に対応していますが、できれば
 <img width="100%" src="https://user-images.githubusercontent.com/39271166/201463450-96bb686e-c5bb-493d-b907-57b5f51ac986.png"><br>
 
 ```bash
-curl -LO https://github.com/tsukumijima/KonomiTV/releases/download/v0.6.0/KonomiTV-Installer.elf
+curl -LO https://github.com/tsukumijima/KonomiTV/releases/download/v0.6.1/KonomiTV-Installer.elf
 chmod a+x KonomiTV-Installer.elf
 ./KonomiTV-Installer.elf
 ```
@@ -389,7 +389,7 @@ KonomiTV の環境設定は、config.yaml に保存されています。
 
 > 設定ファイルは YAML 形式ですが、JSON のようなスタイルで書いています。括弧がないとわかりにくいと思うので… (JSON は YAML のサブセットなので、実は JSON は YAML として解釈可能です)
 
-config.yaml は、インストーラーでインストールした際に自動的に生成されます。将来的には GUI からの環境設定の変更をサポート予定ですが、0.6.0 時点では config.yaml を手動で編集する必要があります。
+config.yaml は、インストーラーでインストールした際に自動的に生成されます。将来的には GUI からの環境設定の変更をサポート予定ですが、現時点では config.yaml を手動で編集する必要があります。
 
 #### バックエンドの設定
 

diff --git a/client/dist/assets/css/app.379ffadb.css b/client/dist/assets/css/app.379ffadb.css
diff --git a/client/dist/assets/css/app.918ddfe6.css b/client/dist/assets/css/app.918ddfe6.css
diff --git a/client/dist/assets/js/app.4d3619bb.js b/client/dist/assets/js/app.4d3619bb.js
diff --git a/client/dist/assets/js/app.4d3619bb.js.map b/client/dist/assets/js/app.4d3619bb.js.map
diff --git a/client/dist/assets/js/app.66d563f0.js b/client/dist/assets/js/app.66d563f0.js
diff --git a/client/dist/assets/js/app.66d563f0.js.map b/client/dist/assets/js/app.66d563f0.js.map
diff --git a/client/dist/index.html b/client/dist/index.html
@@ -1 +1 @@
-<!doctype html><html lang="ja"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@500;700&family=Open+Sans:wght@600;700&display=swap"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/yakuhanjp_s.min.css"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/[email protected]/css/materialdesignicons.min.css"><link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/mizunoko/depot@next/dist/css/common.css"><title>KonomiTV</title><script defer="defer" src="/assets/js/chunk-vendors.58b61fe5.js"></script><script defer="defer" src="/assets/js/app.4d3619bb.js"></script><link href="/assets/css/chunk-vendors.8b5bf3c2.css" rel="stylesheet"><link href="/assets/css/app.918ddfe6.css" rel="stylesheet"><link rel="icon" type="image/svg+xml" href="/assets/images/icons/favicon.svg"><link rel="icon" type="image/png" sizes="32x32" href="/assets/images/icons/favicon-32px.png"><link rel="icon" type="image/png" sizes="16x16" href="/assets/images/icons/favicon-16px.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#0D0807"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><meta name="apple-mobile-web-app-title" content="KonomiTV"><link rel="apple-touch-icon" href="/assets/images/icons/apple-touch-icon.png"><meta name="msapplication-TileColor" content="#000000"></head><body style="background:#1E1310;color:#FFEAEA;"><noscript><strong>We're sorry but KonomiTV doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang="ja"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@500;700&family=Open+Sans:wght@600;700&display=swap"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/yakuhanjp_s.min.css"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/[email protected]/css/materialdesignicons.min.css"><link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/mizunoko/depot@next/dist/css/common.css"><title>KonomiTV</title><script defer="defer" src="/assets/js/chunk-vendors.58b61fe5.js"></script><script defer="defer" src="/assets/js/app.66d563f0.js"></script><link href="/assets/css/chunk-vendors.8b5bf3c2.css" rel="stylesheet"><link href="/assets/css/app.379ffadb.css" rel="stylesheet"><link rel="icon" type="image/svg+xml" href="/assets/images/icons/favicon.svg"><link rel="icon" type="image/png" sizes="32x32" href="/assets/images/icons/favicon-32px.png"><link rel="icon" type="image/png" sizes="16x16" href="/assets/images/icons/favicon-16px.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#0D0807"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><meta name="apple-mobile-web-app-title" content="KonomiTV"><link rel="apple-touch-icon" href="/assets/images/icons/apple-touch-icon.png"><meta name="msapplication-TileColor" content="#000000"></head><body style="background:#1E1310;color:#FFEAEA;"><noscript><strong>We're sorry but KonomiTV doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
diff --git a/client/dist/service-worker.js b/client/dist/service-worker.js