Merge branch 'release/2020.1'

.github/workflows/build.yml

@@ -6,43 +6,139 @@ on:
     - 'doc/**'
 
 jobs:
-  build_raspbian-buster_armv6:
-    name: Build momo for raspbian-buster_armv6
-    runs-on: ubuntu-18.04
+  build-macos:
+    name: Build momo for macOS 10.15
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v1
-      - run: df -hT
-      - run: .github/workflows/script/disk_cleanup.sh
-      - run: df -hT
-      - run: DOCKER_BUILDKIT=1 NOTTY=1 NOMOUNT=1 make raspbian-buster_armv6
+      - run: make macos.package
         working-directory: build
         timeout-minutes: 120
-      - run: df -hT
-      - run: docker system df -v
-  build_raspbian-buster_armv7:
-    name: Build momo for raspbian-buster_armv7
+      - name: Output package name
+        shell: bash
+        run: |
+          cat VERSION | grep MOMO_VERSION > tmp
+          source tmp
+          rm tmp
+          MACOS_VERSION=`sw_vers -productVersion | cut -d '.' -f-2`
+          echo "PACKAGE_NAME=momo-${MOMO_VERSION}_macos-${MACOS_VERSION}.tar.gz" > macos.env
+          echo "::set-output name=name::momo-${MOMO_VERSION}_macos-${MACOS_VERSION}.tar.gz"
+        id: package_name
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: ${{ steps.package_name.outputs.name }}
+          path: build/package/${{ steps.package_name.outputs.name }}
+      - name: Upload Environment
+        uses: actions/upload-artifact@v1
+        with:
+          name: macos.env
+          path: macos.env
+  build-linux:
+    strategy:
+      fail-fast: false
+      matrix:
+        name:
+          - raspbian-buster_armv6
+          - raspbian-buster_armv7
+          - ubuntu-16.04_armv7_ros
+          - ubuntu-16.04_x86_64_ros
+          - ubuntu-18.04_armv8
+          - ubuntu-18.04_armv8_jetson_nano
+          - ubuntu-18.04_x86_64
+    name: Build momo for ${{ matrix.name }}
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
-      - run: .github/workflows/script/disk_cleanup.sh
-      - run: DOCKER_BUILDKIT=1 NOTTY=1 NOMOUNT=1 make raspbian-buster_armv7
+      - run: DOCKER_BUILDKIT=1 NOTTY=1 NOMOUNT=1 make ${{ matrix.name }}.package
         working-directory: build
         timeout-minutes: 120
-  build_ubuntu-18_04_armv8_jetson_nano:
-    name: Build momo for build_ubuntu-18.04_armv8_jetson_nano
-    runs-on: ubuntu-18.04
+      - name: Output package name
+        shell: bash
+        run: |
+          cat VERSION | grep MOMO_VERSION > tmp
+          source tmp
+          rm tmp
+          echo "PACKAGE_NAME=momo-${MOMO_VERSION}_${{ matrix.name }}.tar.gz" > ${{ matrix.name }}.env
+          echo "::set-output name=name::momo-${MOMO_VERSION}_${{ matrix.name }}.tar.gz"
+        id: package_name
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: ${{ steps.package_name.outputs.name }}
+          path: build/package/${{ steps.package_name.outputs.name }}
+      - name: Upload Environment
+        uses: actions/upload-artifact@v1
+        with:
+          name: ${{ matrix.name }}.env
+          path: ${{ matrix.name }}.env
+  create-release:
+    name: Create Release
+    if: contains(github.ref, 'tags/202')
+    needs:
+      - build-macos
+      - build-linux
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - run: .github/workflows/script/disk_cleanup.sh
-      - run: DOCKER_BUILDKIT=1 NOTTY=1 NOMOUNT=1 make ubuntu-18.04_armv8_jetson_nano
-        working-directory: build
-        timeout-minutes: 120
-  build_macos:
-    name: Build momo for macOS 10.15
-    runs-on: macos-latest
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1.0.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          draft: false
+          prerelease: false
+      - name: Output upload url
+        shell: bash
+        run: echo "UPLOAD_URL='${{ steps.create_release.outputs.upload_url }}'" > create-release.env
+      - name: Upload create-release Environment
+        uses: actions/upload-artifact@v1
+        with:
+          name: create-release.env
+          path: create-release.env
+  upload-assets:
+    name: Upload Assets to Release
+    needs:
+      - create-release
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        name:
+          - macos
+          - raspbian-buster_armv6
+          - raspbian-buster_armv7
+          - ubuntu-16.04_armv7_ros
+          - ubuntu-16.04_x86_64_ros
+          - ubuntu-18.04_armv8
+          - ubuntu-18.04_armv8_jetson_nano
+          - ubuntu-18.04_x86_64
     steps:
-      - uses: actions/checkout@v1
-      - run: make macos
-        working-directory: build
-        timeout-minutes: 120
-
+      - uses: actions/download-artifact@v1
+        with:
+          name: ${{ matrix.name }}.env
+      - uses: actions/download-artifact@v1
+        with:
+          name: create-release.env
+      - name: Env to output
+        shell: bash
+        run: |
+          source ${{ matrix.name }}.env/${{ matrix.name }}.env
+          source create-release.env/create-release.env
+          echo "::set-output name=package_name::$PACKAGE_NAME"
+          echo "::set-output name=upload_url::$UPLOAD_URL"
+        id: env
+      - uses: actions/download-artifact@v1
+        with:
+          name: ${{ steps.env.outputs.package_name }}
+      - name: Upload ${{ matrix.name }} Release Asset
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.env.outputs.upload_url }}
+          asset_path: ${{ steps.env.outputs.package_name }}/${{ steps.env.outputs.package_name }}
+          asset_name: ${{ steps.env.outputs.package_name }}
+          asset_content_type: application/gzip

.github/workflows/daily_build.yml

@@ -12,7 +12,6 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
-      - run: .github/workflows/script/disk_cleanup.sh
       - run: DOCKER_BUILDKIT=1 NOTTY=1 NOMOUNT=1 make raspbian-buster_armv6
         working-directory: build
         timeout-minutes: 120
@@ -21,7 +20,6 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
-      - run: .github/workflows/script/disk_cleanup.sh
       - run: DOCKER_BUILDKIT=1 NOTTY=1 NOMOUNT=1 make raspbian-buster_armv7
         working-directory: build
         timeout-minutes: 120
@@ -30,7 +28,6 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
-      - run: .github/workflows/script/disk_cleanup.sh
       - run: DOCKER_BUILDKIT=1 NOTTY=1 NOMOUNT=1 make ubuntu-18.04_armv8_jetson_nano
         working-directory: build
         timeout-minutes: 120
@@ -47,7 +44,6 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
-      - run: .github/workflows/script/disk_cleanup.sh
       - run: DOCKER_BUILDKIT=1 NOTTY=1 NOMOUNT=1 make ubuntu-18.04_x86_64
         working-directory: build
         timeout-minutes: 120
@@ -56,25 +52,22 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
-      - run: .github/workflows/script/disk_cleanup.sh
       - run: DOCKER_BUILDKIT=1 NOTTY=1 NOMOUNT=1 make ubuntu-18.04_armv8
         working-directory: build
         timeout-minutes: 120
-#  build_ubuntu-16_04_armv7_ros:
-#    name: Build momo for Ubuntu 16.04 armv7 ROS
-#    runs-on: ubuntu-16.04
-#    steps:
-#      - uses: actions/checkout@v1
-#      - run: .github/workflows/script/disk_cleanup.sh
-#      - run: DOCKER_BUILDKIT=1 NOTTY=1 NOMOUNT=1 make ubuntu-16.04_armv7_ros
-#        working-directory: build
-#        timeout-minutes: 120
-#  build_ubuntu-16_04_x86_64_ros:
-#    name: Build momo for Ubuntu 16.04 x86_64 ROS
-#    runs-on: ubuntu-16.04
-#    steps:
-#      - uses: actions/checkout@v1
-#      - run: .github/workflows/script/disk_cleanup.sh
-#      - run: DOCKER_BUILDKIT=1 NOTTY=1 NOMOUNT=1 make ubuntu-16.04_x86_64_ros
-#        working-directory: build
-#        timeout-minutes: 120
+  build_ubuntu-16_04_armv7_ros:
+    name: Build momo for Ubuntu 16.04 armv7 ROS
+    runs-on: ubuntu-16.04
+    steps:
+      - uses: actions/checkout@v1
+      - run: DOCKER_BUILDKIT=1 NOTTY=1 NOMOUNT=1 make ubuntu-16.04_armv7_ros
+        working-directory: build
+        timeout-minutes: 120
+  build_ubuntu-16_04_x86_64_ros:
+    name: Build momo for Ubuntu 16.04 x86_64 ROS
+    runs-on: ubuntu-16.04
+    steps:
+      - uses: actions/checkout@v1
+      - run: DOCKER_BUILDKIT=1 NOTTY=1 NOMOUNT=1 make ubuntu-16.04_x86_64_ros
+        working-directory: build
+        timeout-minutes: 120

CHANGES.md

@@ -11,9 +11,75 @@
 
 ## develop
 
+## 2020.1
+
+
+- [UPDATE] libwebrtc を M80.3987@{#2} に上げる
+    - libwebrtc のハッシュは fba51dc69b97f6f170d9c325a38e05ddd69c8b28
+    - @melpon
+- [UPDATE] Momo 2020.1 にバージョンを上げる
+    - バージョン番号を <リリース年>.<その年のリリース回数> に変更
+    - @voluntas
+- [UPDATE] Boost 1.72.0 にアップデートする
+    - @voluntas
+- [UPDATE] --video-device を Linux 全般で有効にする
+    - V4L2 capturer を使うようにした
+    - @shino
+- [UPDATE] Jetson Nano 用のライブラリを NVIDIA L4T 32.3.1 に上げる
+    - [L4T \| NVIDIA Developer](https://developer.nvidia.com/embedded/linux-tegra)
+    - @melpon
+- [UPDATE] 音声系オプションの --disable-residual-echo-detector を追加する
+    - @melpon
+- [ADD] データチャネルを利用したシリアルポートへの読み書き機能を追加する
+    - --serial を指定することでデータチャネル経由でのシリアル読み書きが可能になる
+    - test と ayame モードでのみ利用可能
+    - @tnoho
+- [ADD] 自由に解像度の値を指定できるようにする
+    - `--resolution 640x480` のように指定できるようになりました
+    - この機能が有効になるのは、カメラに依存するため動作保証はありません
+    - @melpon
+- [ADD] Sora モード利用時のシグナリング接続情報に enviroment / libwebrtc / sora_client を追加する
+    - Jetson Nano の場合
+        - `"environment": "[aarch64] Ubuntu 18.04.3 LTS (nvidia-l4t-core 32.2.1-20190812212815)"`
+        - `"libwebrtc": "Shiguredo-Build M80.3987@{#2} (80.3987.2.1 15b26e4)"`
+        - `"sora_client": "WebRTC Native Client Momo 2020.1 (f6b69e77)"`
+    - macOS の場合
+        - `"environment": "[x86_64] macOS Version 10.15.2 (Build 19C57)"`
+        - `"libwebrtc": "Shiguredo-Build M80.3987@{#2} (80.3987.2.1 15b26e4)"`
+        - `"sora_client": "WebRTC Native Client Momo 2020.1 (f6b69e77)"`
+    - Ubuntu 18.04 x86_64 の場合
+        - `"environment": "[x86_64] Ubuntu 18.04.3 LTS"`
+        - `"libwebrtc": "Shiguredo-Build M80.3987@{#2} (80.3987.2.1 15b26e4)"`
+        - `"sora_client": "WebRTC Native Client Momo 2020.1 (f6b69e77)"`
+    - @melpon
+- [ADD] Ayame モード利用時のシグナリング接続情報に enviroment / libwebrtc / ayameClient を追加する
+    - Sora 時の sora_client が ayameClient に変わります
+    - @melpon
+- [ADD] Raspbian ミラーを追加する
+    - @melpon
+- [CHANGE] momo --help の英語化
+    - @shino @msnoigrs
+- [CHANGE] <package>.edit の機能とドキュメントを削除
+    - @melpon
+- [CHANGE] armv6 で SDL を使えなくする
+    - @melpon
+- [FIX] --no-video を指定しているにもかかわらずカメラを一瞬だけ掴むのを修正する
+    - @melpon @mganeko
+- [FIX] SDL が有効でない時に SDL 関連のオプションを指定するとエラーにする
+    - @melpon
+- [FIX] macOS のビルドで Python 2.7 必須を外す
+    - @melpon
+- [FIX] Ayame モードで WebSocket が閉じられた際に再接続処理に進まない箇所を修正
+    - @Hexa
+- [FIX] Ayame モードで シグナリングで bye を受信した際処理として、各 close 処理を追加する
+    - @Hexa
+- [FIX] Ayame モードで 再接続処理の 1 回目を、5 秒後からすぐに実行されるように変更する
+    - @Hexa
+
 ## 19.12.1
 
-- [UPDATE] libwebrtc を時前しないようにする
+- [UPDATE] libwebrtc を時前ビルドしないようにする
+    - https://github.com/shiguredo-webrtc-build/webrtc-build を利用する
     - @melpon
 - [FIX] momo + ayame モードで再接続時に delay してしまう問題を解決
     - @kdxu