Skip to content

Commit

Permalink
Merge branch 'release/2023.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
miosakuma committed Sep 28, 2023
2 parents 75f36b5 + 988d6c1 commit b1444b2
Show file tree
Hide file tree
Showing 100 changed files with 16,889 additions and 10,255 deletions.
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: 時雨堂コミュニティ Discord
url: https://discord.gg/shiguredo
about: Issue を作成するには Discord での相談が必要です
28 changes: 28 additions & 0 deletions .github/actions/download/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: download-artifact

description: Download Artifact

inputs:
platform:
description: Platform
required: true

runs:
using: composite
steps:
- uses: actions/download-artifact@v3
with:
name: ${{ inputs.platform }}.env
path: ${{ inputs.platform }}.env
- name: Env to output
shell: bash
run: |
sed -i 's/\r//g' ${{ inputs.platform }}.env/${{ inputs.platform }}.env
source ${{ inputs.platform }}.env/${{ inputs.platform }}.env
echo "package_name=$PACKAGE_NAME" >> $GITHUB_OUTPUT
echo "$PACKAGE_NAME/$PACKAGE_NAME" >> package_paths.env
id: env
- uses: actions/download-artifact@v3
with:
name: ${{ steps.env.outputs.package_name }}
path: ${{ steps.env.outputs.package_name }}
111 changes: 42 additions & 69 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,14 @@ jobs:
name: Build momo for Windows_${{ matrix.arch }}
runs-on: windows-2019
steps:
- uses: actions/checkout@v3
- uses: microsoft/[email protected]
- uses: actions/checkout@v4
- uses: microsoft/[email protected]
# - uses: GuillaumeFalourd/[email protected]
# with:
# sdk-version: 20348
- name: test
run: |
ls "C:\Program Files (x86)\Windows Kits\10\Include\"
- name: Get Versions
run: |
Get-Content "VERSION" | Foreach-Object {
Expand Down Expand Up @@ -83,7 +89,7 @@ jobs:
name: Build momo for macOS_${{ matrix.arch }}
runs-on: macos-11.0
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get Versions
run: |
source VERSION
Expand Down Expand Up @@ -125,13 +131,13 @@ jobs:
- raspberry-pi-os_armv6
- raspberry-pi-os_armv7
- raspberry-pi-os_armv8
- ubuntu-18.04_armv8_jetson_nano
- ubuntu-18.04_armv8_jetson_xavier
- ubuntu-20.04_x86_64
- ubuntu-20.04_armv8_jetson_xavier
- ubuntu-22.04_x86_64
name: Build momo for ${{ matrix.name }}
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get Versions
run: |
source VERSION
Expand Down Expand Up @@ -173,74 +179,42 @@ jobs:
- build-linux
runs-on: ubuntu-latest
steps:
- name: Create Release
id: create_release
uses: actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/checkout@v4
- uses: ./.github/actions/download
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@v3
platform: windows_x86_64
- uses: ./.github/actions/download
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:
- windows_x86_64
- macos_arm64
- raspberry-pi-os_armv6
- raspberry-pi-os_armv7
- raspberry-pi-os_armv8
- ubuntu-18.04_armv8_jetson_nano
- ubuntu-18.04_armv8_jetson_xavier
- ubuntu-20.04_x86_64
steps:
- uses: actions/download-artifact@v3
platform: macos_arm64
- uses: ./.github/actions/download
with:
name: ${{ matrix.name }}.env
path: ${{ matrix.name }}.env
- uses: actions/download-artifact@v3
platform: raspberry-pi-os_armv6
- uses: ./.github/actions/download
with:
platform: raspberry-pi-os_armv7
- uses: ./.github/actions/download
with:
name: create-release.env
path: create-release.env
platform: raspberry-pi-os_armv8
- uses: ./.github/actions/download
with:
platform: ubuntu-20.04_x86_64
- uses: ./.github/actions/download
with:
platform: ubuntu-20.04_armv8_jetson_xavier
- uses: ./.github/actions/download
with:
platform: ubuntu-22.04_x86_64
- name: Env to output
shell: bash
run: |
sed -i 's/\r//g' ${{ matrix.name }}.env/${{ matrix.name }}.env
sed -i 's/\r//g' create-release.env/create-release.env
source ${{ matrix.name }}.env/${{ matrix.name }}.env
source create-release.env/create-release.env
echo "package_name=$PACKAGE_NAME" >> $GITHUB_OUTPUT
echo "content_type=$CONTENT_TYPE" >> $GITHUB_OUTPUT
echo "upload_url=$UPLOAD_URL" >> $GITHUB_OUTPUT
echo "package_paths<<EOF" >> $GITHUB_OUTPUT
cat package_paths.env >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
id: env
- uses: actions/download-artifact@v3
with:
name: ${{ steps.env.outputs.package_name }}
path: ${{ steps.env.outputs.package_name }}
- name: Upload ${{ matrix.name }} Release Asset
uses: actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Release
uses: softprops/action-gh-release@v1
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: ${{ steps.env.outputs.content_type }}
files:
${{ steps.env.outputs.package_paths }}
notification:
name: Slack Notification
runs-on: ubuntu-latest
Expand All @@ -249,10 +223,9 @@ jobs:
- build-macos
- build-linux
- create-release
- upload-assets
if: always()
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: rtCamp/action-slack-notify@v2
if: |
needs.build-windows.result == 'failure' ||
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/daily_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
name: Build momo for Windows_${{ matrix.arch }}
runs-on: windows-2019
steps:
- uses: actions/checkout@v3
- uses: microsoft/setup-msbuild@v1.1
- uses: actions/checkout@v4
- uses: microsoft/setup-msbuild@v1.3
- name: Get Versions
run: |
Get-Content "VERSION" | Foreach-Object {
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
name: Build momo for macOS_${{ matrix.arch }}
runs-on: macos-11.0
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get Versions
run: |
source VERSION
Expand All @@ -75,13 +75,13 @@ jobs:
- raspberry-pi-os_armv6
- raspberry-pi-os_armv7
- raspberry-pi-os_armv8
- ubuntu-18.04_armv8_jetson_nano
- ubuntu-18.04_armv8_jetson_xavier
- ubuntu-20.04_x86_64
- ubuntu-20.04_armv8_jetson_xavier
- ubuntu-22.04_x86_64
name: Build momo for ${{ matrix.name }}
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get Versions
run: |
source VERSION
Expand All @@ -105,7 +105,7 @@ jobs:
- build-linux
if: always()
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: rtCamp/action-slack-notify@v2
if: |
needs.build-windows.result == 'failure' ||
Expand Down
34 changes: 34 additions & 0 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,40 @@
"cStandard": "c11",
"cppStandard": "c++14",
"intelliSenseMode": "linux-clang-x64"
},
{
"name": "raspberry-pi-os_armv8 on Ubuntu 20.04 x86_64",
"includePath": [
"${workspaceFolder}/src",
"${workspaceFolder}/NvCodec/include",
"${workspaceFolder}/NvCodec/NvCodec",
"${workspaceFolder}/_install/raspberry-pi-os_armv8/Release/webrtc/include",
"${workspaceFolder}/_install/raspberry-pi-os_armv8/Release/webrtc/include/third_party/abseil-cpp",
"${workspaceFolder}/_install/raspberry-pi-os_armv8/Release/webrtc/include/third_party/boringssl/src/include",
"${workspaceFolder}/_install/raspberry-pi-os_armv8/Release/webrtc/include/third_party/libyuv/include",
"${workspaceFolder}/_install/raspberry-pi-os_armv8/Release/webrtc/include/third_party/zlib",
"${workspaceFolder}/_install/raspberry-pi-os_armv8/Release/boost/include",
"${workspaceFolder}/_install/raspberry-pi-os_armv8/Release/CLI11/include",
// "${workspaceFolder}/_install/raspberry-pi-os_armv8/Release/SDL2/include/SDL2",
"${workspaceFolder}/_install/raspberry-pi-os_armv8/Release/rootfs/usr/include",
"${workspaceFolder}/_install/raspberry-pi-os_armv8/Release/rootfs/usr/include/libcamera",
"${workspaceFolder}/_build/raspberry-pi-os_armv8"
],
"defines": [
"WEBRTC_LINUX",
"USE_NVCODEC_ENCODER=0",
"USE_MMAL_ENCODER=0",
"USE_JETSON_ENCODER=0",
"USE_V4L2_ENCODER=1",
"USE_H264=1",
"USE_SDL2=0",
"USE_LINUX_PULSE_AUDIO=0",
"USE_SCREEN_CAPTURER=0"
],
"compilerPath": "${workspaceFolder}/_install/raspberry-pi-os_armv8/Release/llvm/clang/bin/clang",
"cStandard": "c11",
"cppStandard": "c++17",
"intelliSenseMode": "linux-clang-x64"
}
],
"version": 4
Expand Down
70 changes: 69 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,75 @@
},
"files.associations": {
"*.cs": "csharp",
"CMakeLists.txt": "cmake",
"*.txt": "plaintext",
"*.ipp": "cpp"
"*.ipp": "cpp",
"span": "cpp",
"array": "cpp",
"*.tcc": "cpp",
"memory": "cpp",
"future": "cpp",
"istream": "cpp",
"ranges": "cpp",
"functional": "cpp",
"tuple": "cpp",
"utility": "cpp",
"variant": "cpp",
"__functional_base": "cpp",
"locale": "cpp",
"__verbose_abort": "cpp",
"atomic": "cpp",
"string": "cpp",
"vector": "cpp",
"bit": "cpp",
"bitset": "cpp",
"cctype": "cpp",
"chrono": "cpp",
"cmath": "cpp",
"compare": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"map": "cpp",
"set": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"iterator": "cpp",
"memory_resource": "cpp",
"random": "cpp",
"string_view": "cpp",
"system_error": "cpp",
"type_traits": "cpp",
"fstream": "cpp",
"initializer_list": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"limits": "cpp",
"new": "cpp",
"ostream": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"cinttypes": "cpp",
"cwctype": "cpp",
"typeinfo": "cpp",
"__nullptr": "cpp",
"regex": "cpp",
"__config": "cpp",
"__debug": "cpp",
"__node_handle": "cpp",
"__tree": "cpp",
"concepts": "cpp",
"list": "cpp",
"ios": "cpp",
"__threading_support": "cpp",
"any": "cpp",
"__atomic": "cpp",
"filesystem": "cpp"
}
}
Loading

0 comments on commit b1444b2

Please sign in to comment.