diff --git a/.github/actions/setup-gitcookies/action.yml b/.github/actions/setup-gitcookies/action.yml new file mode 100644 index 00000000..26d0bb7d --- /dev/null +++ b/.github/actions/setup-gitcookies/action.yml @@ -0,0 +1,24 @@ +name: "Setup Git Cookies" +description: "Configures a .gitcookies file" +inputs: + cookie-content: + description: "The raw content of the gitcookie" + required: true + cookie-path: + description: "Where to store the cookie file" + default: ".gitcookies" + required: false + +runs: + using: "composite" + steps: + - name: Write and Configure Cookies + uses: gacts/run-and-post-run@v1 + with: + shell: bash + run: | + echo "${{ inputs.cookie-content }}" > "${{ inputs.cookie-path }}" + chmod 600 "${{ inputs.cookie-path }}" + git config --global http.cookiefile "$(pwd)/${{ inputs.cookie-path }}" + + post: rm -f "${{ inputs.cookie-path }}" diff --git a/.github/workflows/webrtc_artifacts.yml b/.github/workflows/webrtc_artifacts.yml index 6d9d8a7c..9974b260 100644 --- a/.github/workflows/webrtc_artifacts.yml +++ b/.github/workflows/webrtc_artifacts.yml @@ -28,6 +28,11 @@ jobs: - name: Install dependencies run: sudo apt-get update && sudo apt-get install -y protobuf-compiler + - name: Setup Git Cookies + uses: ./.github/actions/setup-gitcookies + with: + cookie-content: ${{ secrets.WEBRTC_GIT_COOKIES }} + - run: ./bin/build-webrtc.py --target android --release - name: Output Artifact Checksum @@ -61,6 +66,11 @@ jobs: # Installs the pkg_resources python module needed to build webrtc on a mac host - run: pip install setuptools + - name: Setup Git Cookies + uses: ./.github/actions/setup-gitcookies + with: + cookie-content: ${{ secrets.WEBRTC_GIT_COOKIES }} + - run: ./bin/build-webrtc.py --target ios --release - name: Output Artifact Checksum @@ -92,6 +102,11 @@ jobs: - name: Install dependencies run: sudo apt-get update && sudo apt-get install -y protobuf-compiler crossbuild-essential-arm64 + - name: Setup Git Cookies + uses: ./.github/actions/setup-gitcookies + with: + cookie-content: ${{ secrets.WEBRTC_GIT_COOKIES }} + - run: ./bin/build-webrtc.py --target linux --release - name: Output Artifact Checksum @@ -135,6 +150,11 @@ jobs: # Installs the pkg_resources python module needed to build webrtc on a mac host - run: pip install setuptools + - name: Setup Git Cookies + uses: ./.github/actions/setup-gitcookies + with: + cookie-content: ${{ secrets.WEBRTC_GIT_COOKIES }} + - run: ./bin/build-webrtc.py --target mac --release - name: Output Artifact Checksum @@ -185,6 +205,11 @@ jobs: version-sdk: 26100 features: 'OptionId.WindowsDesktopDebuggers' + - name: Setup Git Cookies + uses: ./.github/actions/setup-gitcookies + with: + cookie-content: ${{ secrets.WEBRTC_GIT_COOKIES }} + - run: python bin/build-webrtc.py --target windows --release shell: bash diff --git a/BUILDING.md b/BUILDING.md index ccc66a1b..6bc9a95e 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -14,6 +14,10 @@ The following is derived from the depot_tools tutorial: https://commondatastorag git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git export PATH=/depot_tools:"$PATH" +### Chromium Gitcookies + +To sync WebRTC build tools from chromium.googlesource.com, you need to setup a .gitcookies that will authenticate to chromium.googlesource.com. Go to [chromium.googlesource.com](https://chromium.googlesource.com/) and sign in with your Google Account. Accept the terms and click [generate a password](https://www.googlesource.com/new-password), then click "Authenticate for all of googlesource.com". Follow the instructions onscreen to setup .gitcookies. + ### Protobuf The protobuf compiler, protoc, is needed to build RingRTC. Installation is platform specific and can be found [here](https://protobuf.dev/installation/). diff --git a/config/version.properties b/config/version.properties index 3ab56548..68ee7a62 100644 --- a/config/version.properties +++ b/config/version.properties @@ -1,4 +1,4 @@ -webrtc.version=7444i +webrtc.version=7680b ringrtc.version.major=2 ringrtc.version.minor=67 diff --git a/config/webrtc_artifact_checksums.json b/config/webrtc_artifact_checksums.json index 7dd52659..2dd3ab04 100644 --- a/config/webrtc_artifact_checksums.json +++ b/config/webrtc_artifact_checksums.json @@ -1,10 +1,10 @@ { - "android": "cb5ae2dca5f13fdfe9b0ba2f509ae1fa47e41d6b040ae5ae3b2abf65ba9ecdbe", - "ios": "35c84370b1bda402aab3902f5a04ffb89f6c9e2d7aa9e483e66db4253c6c4376", - "linux-x64": "903ec5323d937fd9fdea62a7924620b73552652256a4b08f207ba9d0f386f444", - "linux-arm64": "6eb2242360d4b384901b9afad4f92b6f154cc0ff796ec077665555df16c90704", - "mac-x64": "00ed4ba0202bbb029821b5fcee49e9a8cb8bda095a85e1bedf0b115ef3c8a232", - "mac-arm64": "fc9ba0d8d483d4814c03b4da8e7c6c478cb8217544b29964bd635685d9dac856", - "windows-x64": "8fa9404be7ad797b317b7d2208c18663e3c38282e657403d6d15f907f7c0884f", - "windows-arm64": "3bee7cf07a557898612d3abe994b4a51fcb8da6de501f6dc140b9a463e2561e9" + "android": "77cdda613ba93a5e004c5dd3ac23796b2e0fa49f4c5831ccdf6d381185f0bc44", + "ios": "3bcdd8c7ad561c4ace992e833bc6fccab3b170149308d8179f78913e6c320aff", + "linux-x64": "eb3f2bf3662b1973dd35aebe7dea38b040611c70df36da9238dc6c4319b16cc3", + "linux-arm64": "00295d10fabf9549421615b68dba0708131ce21eb76cb5a264bd01096a2fbd8d", + "mac-x64": "1eec62aaa10b7f986258a24ae85f9e1d639f125875f15f8299d63892377f0692", + "mac-arm64": "a571fb11f99ca861b525babe494782cab9b9b6b0cd997c906916a701d68bc430", + "windows-x64": "b4ceaa19c64fe421aae541e04c091f73f1621c2ed0819c9d1c1d053aa99dd264", + "windows-arm64": "5ca83c56d7a43d4a57d53a36100b939cdd58d1f7e8cccfd0e73985fad76103ab" }