Merge branch 'master' into HEAD

Author: Antonito

.github/assert-contributors.sh renamed to .github/generate-authors.sh

@@ -12,6 +12,7 @@
 set -e
 
 SCRIPT_PATH=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
+AUTHORS_PATH="$GITHUB_WORKSPACE/AUTHORS.txt"
 
 if [ -f ${SCRIPT_PATH}/.ci.conf ]
 then
@@ -21,18 +22,18 @@ fi
 #
 # DO NOT EDIT THIS
 #
-EXCLUDED_CONTRIBUTORS+=('John R. Bradley' 'renovate[bot]' 'Renovate Bot' 'Pion Bot')
+EXCLUDED_CONTRIBUTORS+=('John R. Bradley' 'renovate[bot]' 'Renovate Bot' 'Pion Bot' 'pionbot')
 # If you want to exclude a name from all repositories, send a PR to
 # https://github.com/pion/.goassets instead of this repository.
 # If you want to exclude a name only from this repository,
 # add EXCLUDED_CONTRIBUTORS=('name') to .github/.ci.conf
 
-MISSING_CONTRIBUTORS=()
+CONTRIBUTORS=()
 
 shouldBeIncluded () {
 	for i in "${EXCLUDED_CONTRIBUTORS[@]}"
 	do
-		if [ "$i" == "$1" ] ; then
+		if [[ $1 =~ "$i" ]]; then
 			return 1
 		fi
 	done
@@ -41,21 +42,25 @@ shouldBeIncluded () {
 
 
 IFS=$'\n' #Only split on newline
-for contributor in $(git log --format='%aN' | sort -u)
+for contributor in $(git log --format='%aN <%aE>' | LC_ALL=C.UTF-8 sort -uf)
 do
 	if shouldBeIncluded $contributor; then
-		if ! grep -q "$contributor" "$SCRIPT_PATH/../README.md"; then
-			MISSING_CONTRIBUTORS+=("$contributor")
-		fi
+		CONTRIBUTORS+=("$contributor")
 	fi
 done
 unset IFS
 
-if [ ${#MISSING_CONTRIBUTORS[@]} -ne 0 ]; then
-    echo "Please add the following contributors to the README"
-    for i in "${MISSING_CONTRIBUTORS[@]}"
+if [ ${#CONTRIBUTORS[@]} -ne 0 ]; then
+	cat >$AUTHORS_PATH <<-'EOH'
+# Thank you to everyone that made Pion possible. If you are interested in contributing
+# we would love to have you https://github.com/pion/webrtc/wiki/Contributing
+#
+# This file is auto generated, using git to list all individuals contributors.
+# see `.github/generate-authors.sh` for the scripting
+EOH
+    for i in "${CONTRIBUTORS[@]}"
     do
-	    echo "$i"
+	    echo "$i" >> $AUTHORS_PATH
     done
-    exit 1
+    exit 0
 fi

.github/hooks/pre-push.sh

@@ -8,6 +8,6 @@
 
 set -e
 
-.github/assert-contributors.sh
+.github/generate-authors.sh
 
 exit 0

.github/workflows/browser-e2e.yaml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: test
         run: |
           docker build -t pion-webrtc-e2e -f e2e/Dockerfile .

.github/workflows/generate-authors.yml

@@ -0,0 +1,73 @@
+#
+# DO NOT EDIT THIS FILE
+#
+# It is automatically copied from https://github.com/pion/.goassets repository.
+# If this repository should have package specific CI config,
+# remove the repository name from .goassets/.github/workflows/assets-sync.yml.
+#
+# If you want to update the shared CI config, send a PR to
+# https://github.com/pion/.goassets instead of this repository.
+#
+
+name: generate-authors
+
+on:
+  pull_request:
+
+jobs:
+  checksecret:
+    runs-on: ubuntu-latest
+    outputs:
+      is_PIONBOT_PRIVATE_KEY_set: ${{ steps.checksecret_job.outputs.is_PIONBOT_PRIVATE_KEY_set }}
+    steps:
+      - id: checksecret_job
+        env:
+          PIONBOT_PRIVATE_KEY: ${{ secrets.PIONBOT_PRIVATE_KEY }}
+        run: |
+          echo "is_PIONBOT_PRIVATE_KEY_set: ${{ env.PIONBOT_PRIVATE_KEY != '' }}"
+          echo "::set-output name=is_PIONBOT_PRIVATE_KEY_set::${{ env.PIONBOT_PRIVATE_KEY != '' }}"
+
+  generate-authors:
+    needs: [checksecret]
+    if: needs.checksecret.outputs.is_PIONBOT_PRIVATE_KEY_set == 'true'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        ref: ${{ github.head_ref }}
+        fetch-depth: 0
+        token: ${{ secrets.PIONBOT_PRIVATE_KEY }}
+
+    - name: Generate the authors file
+      run: .github/generate-authors.sh
+
+    - name: Add the authors file to git
+      run: git add AUTHORS.txt
+
+    - name: Get last commit message
+      id: last-commit-message
+      run: |
+        COMMIT_MSG=$(git log -1 --pretty=%B)
+        COMMIT_MSG="${COMMIT_MSG//'%'/'%25'}"
+        COMMIT_MSG="${COMMIT_MSG//$'\n'/'%0A'}"
+        COMMIT_MSG="${COMMIT_MSG//$'\r'/'%0D'}"
+        echo "::set-output name=msg::$COMMIT_MSG"
+
+    - name: Get last commit author
+      id: last-commit-author
+      run: |
+        echo "::set-output name=msg::$(git log -1 --pretty='%aN <%ae>')"
+
+    - name: Check if AUTHORS.txt file has changed
+      id: git-status-output
+      run: |
+        echo "::set-output name=msg::$(git status -s | wc -l)"
+
+    - name: Commit and push
+      if: ${{ steps.git-status-output.outputs.msg != '0' }}
+      run: |
+        git config user.email $(echo "${{ steps.last-commit-author.outputs.msg }}" | sed 's/\(.\+\) <\(\S\+\)>/\2/')
+        git config user.name $(echo "${{ steps.last-commit-author.outputs.msg }}" | sed 's/\(.\+\) <\(\S\+\)>/\1/')
+        git add AUTHORS.txt
+        git commit --amend --no-edit
+        git push --force https://github.com/${GITHUB_REPOSITORY} $(git symbolic-ref -q --short HEAD)

.github/workflows/lint.yaml

@@ -1,3 +1,14 @@
+#
+# DO NOT EDIT THIS FILE
+#
+# It is automatically copied from https://github.com/pion/.goassets repository.
+# If this repository should have package specific CI config,
+# remove the repository name from .goassets/.github/workflows/assets-sync.yml.
+#
+# If you want to update the shared CI config, send a PR to
+# https://github.com/pion/.goassets instead of this repository.
+#
+
 name: Lint
 on:
   pull_request:
@@ -12,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-        - uses: actions/checkout@v2
+        - uses: actions/checkout@v3
           with:
             fetch-depth: 0
 
@@ -22,9 +33,6 @@ jobs:
         - name: File names
           run: .github/lint-filename.sh
 
-        - name: Contributors
-          run: .github/assert-contributors.sh
-
         - name: Functions
           run: .github/lint-disallowed-functions-in-library.sh
 
@@ -34,10 +42,10 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           version: v1.31
           args: $GOLANGCI_LINT_EXRA_ARGS

.github/workflows/renovate-go-mod-fix.yaml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 2
       - name: fix

.github/workflows/standardjs.yaml

@@ -0,0 +1,17 @@
+name: StandardJS
+on:
+  pull_request:
+    types:
+      - opened
+      - edited
+      - synchronize
+jobs:
+  StandardJS:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 12.x
+      - run: npm install standard
+      - run: npx standard

.github/workflows/test.yaml

@@ -1,3 +1,14 @@
+#
+# DO NOT EDIT THIS FILE
+#
+# It is automatically copied from https://github.com/pion/.goassets repository.
+# If this repository should have package specific CI config,
+# remove the repository name from .goassets/.github/workflows/assets-sync.yml.
+#
+# If you want to update the shared CI config, send a PR to
+# https://github.com/pion/.goassets instead of this repository.
+#
+
 name: Test
 on:
   push:
@@ -11,11 +22,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ["1.15", "1.16"]
+        go: ["1.16", "1.17"]
       fail-fast: false
     name: Go ${{ matrix.go }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: actions/cache@v2
         with:
@@ -28,7 +39,7 @@ jobs:
             ${{ runner.os }}-amd64-go-
 
       - name: Setup Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go }}
 
@@ -39,11 +50,19 @@ jobs:
 
       - name: Run test
         run: |
+          TEST_BENCH_OPTION="-bench=."
+          if [ -f .github/.ci.conf ]; then . .github/.ci.conf; fi
+
           go-acc -o cover.out ./... -- \
-          -bench=. \
-          -v -race
+            ${TEST_BENCH_OPTION} \
+            -v -race
+
+      - name: Run TEST_HOOK
+        run: |
+          if [ -f .github/.ci.conf ]; then . .github/.ci.conf; fi
+          if [ -n "${TEST_HOOK}" ]; then ${TEST_HOOK}; fi
 
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v2
         with:
           file: ./cover.out
           name: codecov-umbrella
@@ -54,11 +73,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ["1.15", "1.16"]
+        go: ["1.16", "1.17"]
       fail-fast: false
     name: Go i386 ${{ matrix.go }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: actions/cache@v2
         with:
@@ -73,30 +92,30 @@ jobs:
         run: |
           mkdir -p $HOME/go/pkg/mod $HOME/.cache
           docker run \
-          -u $(id -u):$(id -g) \
-          -e "GO111MODULE=on" \
-          -e "CGO_ENABLED=0" \
-          -v $GITHUB_WORKSPACE:/go/src/github.com/pion/$(basename $GITHUB_WORKSPACE) \
-          -v $HOME/go/pkg/mod:/go/pkg/mod \
-          -v $HOME/.cache:/.cache \
-          -w /go/src/github.com/pion/$(basename $GITHUB_WORKSPACE) \
-          i386/golang:${{matrix.go}}-alpine \
-          /usr/local/go/bin/go test \
-            ${TEST_EXTRA_ARGS:-} \
-            -v ./...
+            -u $(id -u):$(id -g) \
+            -e "GO111MODULE=on" \
+            -e "CGO_ENABLED=0" \
+            -v $GITHUB_WORKSPACE:/go/src/github.com/pion/$(basename $GITHUB_WORKSPACE) \
+            -v $HOME/go/pkg/mod:/go/pkg/mod \
+            -v $HOME/.cache:/.cache \
+            -w /go/src/github.com/pion/$(basename $GITHUB_WORKSPACE) \
+            i386/golang:${{matrix.go}}-alpine \
+            /usr/local/go/bin/go test \
+              ${TEST_EXTRA_ARGS:-} \
+              -v ./...
 
   test-wasm:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     name: WASM
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '12.x'
+          node-version: '16.x'
 
       - uses: actions/cache@v2
         with:
@@ -110,7 +129,7 @@ jobs:
       - name: Download Go
         run: curl -sSfL https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz | tar -C ~ -xzf -
         env:
-          GO_VERSION: 1.16
+          GO_VERSION: 1.17
 
       - name: Set Go Root
         run: echo "GOROOT=${HOME}/go" >> $GITHUB_ENV
@@ -119,19 +138,20 @@ jobs:
         run: echo "GOPATH=${HOME}/go" >> $GITHUB_ENV
 
       - name: Set Go Path
-        run: echo "GO_JS_WASM_EXEC=${PWD}/test-wasm/go_js_wasm_exec" >> $GITHUB_ENV
+        run: echo "GO_JS_WASM_EXEC=${GOROOT}/misc/wasm/go_js_wasm_exec" >> $GITHUB_ENV
 
       - name: Insall NPM modules
         run: yarn install
 
       - name: Run Tests
         run: |
+          if [ -f .github/.ci.conf ]; then . .github/.ci.conf; fi
           GOOS=js GOARCH=wasm $GOPATH/bin/go test \
-          -coverprofile=cover.out -covermode=atomic \
-          -exec="${GO_JS_WASM_EXEC}" \
-          -v ./...
+            -coverprofile=cover.out -covermode=atomic \
+            -exec="${GO_JS_WASM_EXEC}" \
+            -v ./...
 
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v2
         with:
           file: ./cover.out
           name: codecov-umbrella

.github/workflows/tidy-check.yaml

@@ -23,9 +23,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
       - name: check
         run: |
           go mod download