Skip to content

Commit

Permalink
Merge pull request #567 from LizardByte/nightly
Browse files Browse the repository at this point in the history
v0.17.0
  • Loading branch information
ReenigneArcher committed Jan 9, 2023
2 parents 08d623c + 009975d commit b2fe042
Show file tree
Hide file tree
Showing 160 changed files with 5,410 additions and 24,050 deletions.
21 changes: 11 additions & 10 deletions .github/workflows/CI.yml
Expand Up @@ -9,6 +9,10 @@ on:
branches: [master, nightly]
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
github_env:
name: GitHub Env Debug
Expand Down Expand Up @@ -185,7 +189,7 @@ jobs:
elif [[ ${{ github.ref == 'refs/heads/nightly' }} ]]; then
sub_version=".r${commit}"
echo "aur_publish=true" >> $GITHUB_ENV
echo "aur_publish=false" >> $GITHUB_ENV
fi
else
echo "This is a PR event"
Expand Down Expand Up @@ -388,7 +392,8 @@ jobs:
libboost-filesystem1.71-dev \
libboost-log1.71-dev \
libboost-regex1.71-dev \
libboost-thread1.71-dev
libboost-thread1.71-dev \
libboost-program-options1.71-dev
# Install cmake
wget https://cmake.org/files/v3.22/cmake-3.22.2-linux-x86_64.sh
Expand All @@ -412,7 +417,8 @@ jobs:
cmake \
libboost-filesystem-dev \
libboost-log-dev \
libboost-thread-dev
libboost-thread-dev \
libboost-program-options-dev
fi
sudo apt-get install -y \
Expand Down Expand Up @@ -466,9 +472,7 @@ jobs:
mkdir -p build
mkdir -p artifacts
pushd "./src_assets/common/assets/web"
npm install
popd
cd build
cmake -DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -588,9 +592,7 @@ jobs:
- name: Build MacOS
run: |
pushd "./src_assets/common/assets/web"
npm install
popd
mkdir build
cd build
Expand Down Expand Up @@ -888,12 +890,11 @@ jobs:
mingw-w64-x86_64-openssl
mingw-w64-x86_64-opus
mingw-w64-x86_64-toolchain
mingw-w64-x86_64-x265
nasm
wget
yasm
- name: Install npm packages
working-directory: src_assets/common/assets/web
run: |
npm install
Expand All @@ -906,7 +907,7 @@ jobs:
-DSUNSHINE_ASSETS_DIR=assets \
-G "MinGW Makefiles" \
..
mingw32-make -j2
mingw32-make -j$(nproc)
- name: Package Windows
shell: msys2 {0}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/auto-create-pr.yml
Expand Up @@ -3,6 +3,9 @@
# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
# the above-mentioned repo.

# This workflow creates a PR automatically when anything is merged/pushed into the `nightly` branch. The PR is created
# against the `master` (default) branch.

name: Auto create PR

on:
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/automerge.yml
Expand Up @@ -3,6 +3,8 @@
# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
# the above-mentioned repo.

# This workflow will, first, automatically approve PRs created by @LizardByte-bot. Then it will automerge relevant PRs.

name: Automerge PR

on:
Expand All @@ -11,6 +13,10 @@ on:
- opened
- synchronize

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
autoapprove:
if: >-
Expand Down Expand Up @@ -40,9 +46,6 @@ jobs:
if: startsWith(github.repository, 'LizardByte/')
needs: [autoapprove]
runs-on: ubuntu-latest
concurrency:
group: automerge-${{ github.ref }}
cancel-in-progress: true

steps:
- name: Automerging
Expand All @@ -51,7 +54,7 @@ jobs:
BASE_BRANCHES: nightly
GITHUB_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
GITHUB_LOGIN: ${{ secrets.GH_BOT_NAME }}
MERGE_LABELS: ""
MERGE_LABELS: "!dependencies"
MERGE_METHOD: "squash"
MERGE_COMMIT_MESSAGE: "{pullRequest.title} (#{pullRequest.number})"
MERGE_DELETE_BRANCH: true
Expand Down
15 changes: 4 additions & 11 deletions .github/workflows/autoupdate-labeler.yml
Expand Up @@ -3,18 +3,17 @@
# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
# the above-mentioned repo.

# Label PRs with `autoupdate` if various conditions are met, otherwise, remove the label.

name: Label PR autoupdate

on:
pull_request_target:
types:
- edited
- opened
- reopened
- synchronize
pull_request_review:
types:
- edited
- submitted

jobs:
label_pr:
Expand All @@ -40,12 +39,7 @@ jobs:
steps.org_member.outputs.result == 'true' &&
contains(github.event.pull_request.labels.*.name, 'autoupdate') == false &&
contains(github.event.pull_request.body,
fromJSON('"\n- [x] I want maintainers to keep my branch updated"')) == true &&
(
(github.event_name == 'pull_request_review' && github.event.review.state == 'approved') ||
(github.event_name == 'pull_request')
)
fromJSON('"\n- [x] I want maintainers to keep my branch updated"')) == true
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GH_BOT_TOKEN }}
Expand All @@ -60,7 +54,6 @@ jobs:
- name: Unlabel autoupdate
if: >-
contains(github.event.pull_request.labels.*.name, 'autoupdate') &&
github.event_name == 'pull_request' &&
(
(github.event.action == 'synchronize' && steps.org_member.outputs.result == 'false') ||
(contains(github.event.pull_request.body,
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/autoupdate.yml
Expand Up @@ -7,8 +7,9 @@
# - automerge
# - autoupdate-labeler

# It uses GitHub Action that auto-updates pull requests branches, when changes are pushed to their destination branch.
# It uses an action that auto-updates pull requests branches, when changes are pushed to their destination branch.
# Auto-updating to the latest destination branch works only in the context of upstream repo and not forks.
# Dependabot PRs are updated by an action that comments `@depdenabot rebase` on dependabot PRs.

name: autoupdate

Expand Down Expand Up @@ -36,8 +37,7 @@ jobs:
dependabot-rebase:
name: Dependabot Rebase
if: >-
startsWith(github.repository, 'LizardByte/') &&
contains(github.event.pull_request.labels.*.name, 'central_dependency') == false
startsWith(github.repository, 'LizardByte/')
runs-on: ubuntu-latest
steps:
- name: rebase
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/ci-docker.yml
Expand Up @@ -3,6 +3,10 @@
# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
# the above-mentioned repo.

# This workflow is intended to work with all our organization Docker projects. Docker platforms/architectures should be
# listed in a file named `.docker_platforms`, comma separated list with no spaces. A readme named `DOCKER_README.md`
# will be used to update the description on Docker hub.

name: CI Docker

on:
Expand All @@ -13,6 +17,10 @@ on:
branches: [master, nightly]
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
check_dockerfile:
name: Check Dockerfile
Expand Down
60 changes: 0 additions & 60 deletions .github/workflows/cpp-clang-format-lint.yml

This file was deleted.

84 changes: 84 additions & 0 deletions .github/workflows/cpp-lint.yml
@@ -0,0 +1,84 @@
---
# This action is centrally managed in https://github.com/<organization>/.github/
# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
# the above-mentioned repo.

# Lint c++ source files and cmake files.

name: C++ Lint

on:
pull_request:
branches: [master, nightly]
types: [opened, synchronize, reopened]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
clang-format:
name: Clang Format Lint
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Find cpp files
id: cpp_files
run: |
cpp_files=$(find . -type f -iname "*.cpp" -o -iname "*.h" -o -iname "*.m" -o -iname "*.mm")
echo "found cpp files: ${cpp_files}"
# do not quote to keep this as a single line
echo cpp_files=${cpp_files} >> $GITHUB_OUTPUT
- name: Clang format lint
if: ${{ steps.cpp_files.outputs.cpp_files }}
uses: DoozyX/clang-format-lint-action@v0.15
with:
source: ${{ steps.cpp_files.outputs.cpp_files }}
extensions: 'cpp,h,m,mm'
clangFormatVersion: 15
style: file
inplace: false

- name: Upload Artifacts
if: failure()
uses: actions/upload-artifact@v3
with:
name: clang-format-fixes
path: ${{ steps.cpp_files.outputs.cpp_files }}

cmake-lint:
name: CMake Lint
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools cmakelang
- name: Find cmake files
id: cmake_files
run: |
cmake_files=$(find . -type f -iname "CMakeLists.txt" -o -iname "*.cmake")
echo "found cmake files: ${cmake_files}"
# do not quote to keep this as a single line
echo cmake_files=${cmake_files} >> $GITHUB_OUTPUT
- name: Test with cmake-lint
run: |
cmake-lint --line-width 120 --tab-size 4 ${{ steps.cmake_files.outputs.cmake_files }}
6 changes: 4 additions & 2 deletions .github/workflows/issues-stale.yml
Expand Up @@ -3,6 +3,8 @@
# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in
# the above-mentioned repo.

# Manage stale issues and PRs.

name: Stale Issues / PRs

on:
Expand All @@ -16,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Stale
uses: actions/stale@v6
uses: actions/stale@v7
with:
close-issue-message: >
This issue was closed because it has been stalled for 10 days with no activity.
Expand All @@ -38,7 +40,7 @@ jobs:
repo-token: ${{ secrets.GH_BOT_TOKEN }}

- name: Invalid Template
uses: actions/stale@v6
uses: actions/stale@v7
with:
close-issue-message: >
This issue was closed because the the template was not completed after 5 days.
Expand Down

0 comments on commit b2fe042

Please sign in to comment.