Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
7bf6e9c
[Cobalt] Add switch between Cobalt and Chromium for logs prefix
Awallky Mar 31, 2025
754f3e8
[Cobalt] Optimize Build Size for Android
Awallky Apr 1, 2025
69191a8
[Cobalt] Remove unused //components/crash/android from builds
Awallky Apr 2, 2025
114d64d
Removing use of crashpad in content shell library
Awallky Apr 2, 2025
d690a62
Fixing linux build failures. Making Zygote calls empty for Cobalt.
Awallky Apr 3, 2025
cea6d6c
Removing crashpad binaries from Chrobalt builds
Awallky Apr 3, 2025
caabbf8
Change behavior for all Android TV devices instead of just Cobalt
Awallky Apr 4, 2025
11f4814
Reformatting a bit to make build file more readable.
Awallky Apr 4, 2025
559381f
Adding space between if and parentheses
Awallky Apr 4, 2025
6b87c80
Update BUILD_STATUS.md
briantting Apr 8, 2025
8e49c9e
Fix nightly trigger naming and branch
briantting Apr 8, 2025
87a8fa6
Merge branch 'main' into remove-android-crash-logging-lib
Awallky Apr 8, 2025
72234a1
Explicitly pass activity into openCobaltService() (#5319)
zhongqiliang Apr 8, 2025
a892f60
[Cobalt] Remove unused crashpad library (#5281)
Awallky Apr 8, 2025
69d6ea6
[Cobalt] Optimize Build Size for Android - Remove VariationsSeedFetch…
Awallky Apr 8, 2025
844a70f
Merge branch 'main' into make_cobalt_logs_only_for_cobalt_builds
Awallky Apr 8, 2025
6978f09
Update BUILD_STATUS.md (#5323)
briantting Apr 8, 2025
72a974c
Fix nightly trigger naming and branch (#5325)
briantting Apr 8, 2025
7b8f62f
[media] Refine DecoderBuffer ctor (#5322)
xiaomings Apr 8, 2025
f2ff70b
Squashed 'third_party/webrtc/' content from commit 729f79c176c8b
andrewsavage1 Apr 9, 2025
3256bf3
Merge commit 'f2ff70b501fca22da5eab394dd5bdc1239a6ec69' as 'third_par…
andrewsavage1 Apr 9, 2025
c5ca6a0
Import webrtc from commit 729f79c176c8b (#5340)
andrewsavage1 Apr 9, 2025
caa399e
Disable NSS certificates (#5334)
kaidokert Apr 9, 2025
f5d3c29
[Cobalt] Add switch between Cobalt and Chromium for logs prefix (#5249)
Awallky Apr 9, 2025
987ce29
[media] Improve DecoderBufferAllocator logging (#5036)
xiaomings Apr 9, 2025
1fe8389
[media] Refactor StarboardRenderer with StarboardRendererTraits (#5350)
borongc Apr 9, 2025
11786bc
Initialize Finch (#5187)
yjzhang111 Apr 9, 2025
e50cb8f
Move audio input permission check to getUserMedia(). (#5296)
Apr 9, 2025
fc4eece
Fix remaining compiler issues in hermetic cobalt (#5316)
andrewsavage1 Apr 10, 2025
c9fc4e7
[media] Reset player state after pending flushes (#5353)
borongc Apr 10, 2025
5b8bae0
Remove certifi (#5329)
oxve Apr 10, 2025
b833e4d
Add TODO for window.accessibility test (#5361)
haozheng-cobalt Apr 10, 2025
5e63614
Fix Ozone_demo link error Undefined base::UnloadNativeLibrary (#5363)
sherryzy Apr 10, 2025
6492576
Reduce spammy logging around test run (#5330)
oxve Apr 10, 2025
3a2b2fd
Ensure localStorage is flushed at most 1 second after mutation. (#5359)
Apr 10, 2025
c73382e
Remove unnecessary testonly tags from cobalt_apk (#5288)
johnxwork Apr 10, 2025
2bfd4ab
Add @youtube/cobalt-web-api code owners coverage (#5327)
hlwarriner Apr 11, 2025
638d7e6
Resolve crashpad-related linker errors with stubs (#5379)
hlwarriner Apr 11, 2025
3e0c8f2
[Cobalt] Add license file generation to builds
Awallky Apr 11, 2025
796a357
Fix build issues for more generalized directory arg
Awallky Apr 11, 2025
24c20e5
Fix compiler error building cobalt (#5365)
niranjanyardi Apr 11, 2025
fde6ae7
[media] Retrieve RRO values on the same thread without mutex lock (#5…
borongc Apr 11, 2025
b39efae
Install missing libs and unfilter net_unittests (#5370)
oxve Apr 11, 2025
3cc8551
[blink_unittests] Fix unimplemented CreateStarboardRenderer (#5384)
borongc Apr 11, 2025
fbddcb7
Move license generation to its own action
Awallky Apr 11, 2025
a8e3038
[media] Acquire GpuChannelToken for StarboardRenderer (#5320)
borongc Apr 11, 2025
8c5b14a
Fixing Android builds for cobalt:gn_all with target 'chromium'
Awallky Apr 11, 2025
088ed67
Bump lint workflow timeout (#5390)
oxve Apr 12, 2025
bdaba2e
starboard: Create starboard_unittest_wrapper (#5031)
yell0wd0g Apr 12, 2025
208ed42
Adding missing param to contains method in yaml filter
Awallky Apr 14, 2025
3bf3101
Fix white screen on CoAT launch (#5383)
TyHolc Apr 14, 2025
6b651df
Merge branch 'main' into add-license-gen-to-builds
Awallky Apr 14, 2025
4b39860
CobaltA11yHelper requests focus on WebContents (#5388)
haozheng-cobalt Apr 14, 2025
1d566b4
Add support for stereo wav file to Audio Decoder (#5345)
sideb0ard Apr 14, 2025
8603a94
Merge branch 'main' into add-license-gen-to-builds
Awallky Apr 14, 2025
61d5ac9
Replace pattern used to find last valid commit for build timestamp (#…
oxve Apr 14, 2025
1b0f1df
Merge branch 'main' into add-license-gen-to-builds
Awallky Apr 14, 2025
0e2f008
ODT gateway change (#5401)
Libzu Apr 14, 2025
dff52ab
[media] Simplify initializing StarboardRenderer (#5400)
borongc Apr 14, 2025
63e701c
[Cobalt] Add license file generation to builds (#5381)
Awallky Apr 14, 2025
522ab00
Fix lastchange calculation for Cobalt
andrewsavage1 Apr 14, 2025
e66bf11
Only add filter to LASTCHANGE calc
andrewsavage1 Apr 14, 2025
24999ce
[media] Refine DecoderBufferAllocatorTest (#5394)
xiaomings Apr 14, 2025
82430e3
starboard: roll up the remaining unittest targets (#5127)
yell0wd0g Apr 14, 2025
6291f70
Fix occaional crash after StarboardRenderer is destroyed (#5392)
kjyoun Apr 14, 2025
9a245fd
Use simpler regex
andrewsavage1 Apr 15, 2025
4eee7fc
Focus output of print logs steps on test logs (#5407)
oxve Apr 15, 2025
d6e3445
Rename libcobalt_content_shell_content_view (#5382)
jellefoks Apr 15, 2025
a5ccce1
Remove EGL/GLES from linux package (#5419)
kaidokert Apr 15, 2025
88a3faf
Remove implementation for GetDisplaySettings() (#5314)
zhongqiliang Apr 15, 2025
14107bc
Update DecoderBuffer memory budget on format change (#5421)
xiaomings Apr 15, 2025
6ba0467
Add logs to track deeplink urls (#5417)
zhongqiliang Apr 15, 2025
fd37659
[media] Optimize DecoderBufferAllocator (#5412)
xiaomings Apr 15, 2025
1257601
Get rid fo extended regex
andrewsavage1 Apr 16, 2025
780277b
Fix lastchange calculation for Cobalt (#5395)
andrewsavage1 Apr 16, 2025
111005a
Change cobalt to shlib for hermetic builds (#5380)
andrewsavage1 Apr 16, 2025
bed0df8
Remove invalid rendered frames when calculating dropped frames (#5313)
kjyoun Apr 16, 2025
5661218
Add license gen to Kokoro build as well (#5436)
kaidokert Apr 16, 2025
08a06b5
Follow-up Kokoro license build fix (#5438)
kaidokert Apr 16, 2025
2878c2c
[android] Support multiple punchout players via video holes (#5422)
borongc Apr 16, 2025
2e21bfc
Re-enable SbAudioSinkTest (#5431)
kjyoun Apr 16, 2025
8c1ad33
Migrate MediaCodec (#5405)
haozheng-cobalt Apr 16, 2025
86a8627
Re-enable PosixFileRead for linux-evergreen-nplb tests (#5435)
kjyoun Apr 16, 2025
6fd75ec
Remove crashpad dependency from Cobalt.apk (#5430)
johnxwork Apr 16, 2025
f72c875
Fix generated license path (#5445)
kaidokert Apr 16, 2025
4cb5d7a
Remove unused Kokoro scripts (#5450)
kaidokert Apr 17, 2025
580ac40
Add the web-tests test job (#5267)
oxve Apr 17, 2025
72b0923
Add debugging log for navigation redirects (#5429)
johnxwork Apr 17, 2025
24f5f4a
Abstract allocator out of DecoderBufferAllocator (#5454)
xiaomings Apr 17, 2025
a40bfe3
Disable Pepper API for linux builds (#5461)
niranjanyardi Apr 17, 2025
5c2ff69
Add test workflow to automate rebasing.
SortaCookie Apr 8, 2025
48c7ca8
Post review on cherry-pick conflicts
oxve Apr 22, 2025
905d802
Fix syntax error for rebase commit
SortaCookie Apr 23, 2025
ef479e4
Add new logging for sync workflow
SortaCookie Apr 23, 2025
14c9846
fix target to use milestone rather than branch
SortaCookie Apr 23, 2025
39fd161
Add more logging and use HEAD since we're checking out at the branch …
SortaCookie Apr 23, 2025
b5a6c1e
Add token for auth
SortaCookie Apr 23, 2025
0c52c46
Add username and email for auth
SortaCookie Apr 23, 2025
aefcd07
Add check for diffs
SortaCookie Apr 23, 2025
4244af1
Re-adding logging messages
SortaCookie Apr 24, 2025
3d6b2d4
Add step to free space on the GitHub runner
SortaCookie Apr 24, 2025
5733d2b
Add measuring for volumes
SortaCookie Apr 24, 2025
5f3f73e
Update path to sandbox in docker-compose.yaml
oxve Apr 24, 2025
ec128ca
Change workflow to run on a our GCP runner instead od of GitHub.
SortaCookie Apr 24, 2025
e47402e
Fetch only the latest commit rather than the whole history
SortaCookie Apr 24, 2025
ed841be
Removed unnecessary logging and added log to check if the diff patch is
SortaCookie Apr 24, 2025
e45eaed
Experimental change to see if we can get speed up depot_tools by cach…
SortaCookie Apr 8, 2025
7cfa6e8
Test with new label to run tests only on experimental workers.
SortaCookie Apr 10, 2025
c7ec738
Merge branch 'experimental/gsync-caching' into experimental/gsync-cac…
SortaCookie Apr 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@
/components/viz/service/display/starboard/ # no owners
/ui/ozone/platform/starboard/ # no owners
/cobalt/build/gn.py @youtube/cobalt-build
/third_party/blink/ @youtube/cobalt-web-api

*.nplb_filter.json @youtube/nplb-filters
32 changes: 27 additions & 5 deletions .github/actions/build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build Cobalt
description: Builds Cobalt targets
inputs:
targets:
description: "List of ninja targets for Cobalt build."
description: "JSON list of ninja targets for Cobalt build."
required: true
test_root_target:
description: "The root target from which to deduce what tests to run."
Expand All @@ -16,6 +16,9 @@ inputs:
upload_on_device_test_artifacts:
description: "Indicates if on-device test artifacts should be uploaded."
required: true
upload_web_test_artifacts:
description: "Indicates if web test artifacts should be uploaded."
required: true
test_artifacts_key:
description: "Artifact key used to store on-host test artifacts."
required: true
Expand Down Expand Up @@ -43,16 +46,25 @@ runs:
git diff --name-only -r ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} > ${CHANGED_FILES_LIST}
shell: bash
- name: Calculate test targets
if: matrix.config == 'devel' && inputs.test_root_target != 'null'
if: matrix.config == 'devel' && (inputs.test_root_target != 'null' || inputs.upload_web_test_artifacts == 'true')
id: calculate-test-targets
env:
CHANGED_FILES_LIST: changed_files.txt
ROOT_TARGET: ${{ inputs.test_root_target }}
IS_WEB_TESTS: ${{ inputs.upload_web_test_artifacts }}
STATIC_TEST_TARGETS_JSON_FILE: cobalt/build/testing/targets/${{ matrix.platform }}/test_targets.json
# TODO(b/382508397): Replace hardcoded list with dynamically generated one.
DYN_TEST_TARGETS_JSON_FILE: out/${{ matrix.platform }}_${{ matrix.config }}/dyn_targets.json
run: |
set -x

if [[ ${IS_WEB_TESTS} == "true" ]]; then
test_targets_json='[":blink_web_tests"]'
echo "test_targets_json=${test_targets_json}" >> $GITHUB_OUTPUT
echo "test_targets_count=1" >> $GITHUB_OUTPUT
exit 0
fi

cd src
gn desc out/${{ matrix.platform }}_${{ matrix.config }}/ "*" --format=json > gn_desc.json
# Trim any warning gn printed before the json (all lines above the first curly brace).
Expand Down Expand Up @@ -99,12 +111,22 @@ runs:
shell: bash
- name: Ninja build
env:
TARGETS: ${{ inputs.targets }}
TARGETS_JSON: ${{ inputs.targets }}
run: |
set -ex
cd src
TARGETS=$(echo "${TARGETS_JSON}" | jq -cr '. | join(" ")')
time autoninja -C out/${{ matrix.platform }}_${{ matrix.config }} ${TARGETS}
shell: bash
- name: Generate License File
if: startsWith(matrix.platform, 'android') && !contains(matrix.platform, 'chromium')
run: |
set -ex
cd src
out_dir=out/${{ matrix.platform }}_${{ matrix.config }}
tools/licenses/licenses.py credits --gn-target cobalt:gn_all --gn-out-dir ${out_dir} \
> ${out_dir}/licenses_cobalt.txt
shell: bash
- name: Archive Android APKs
if: startsWith(matrix.platform, 'android') && matrix.config == 'qa'
uses: actions/upload-artifact@v4
Expand All @@ -119,6 +141,6 @@ runs:
uses: ./src/.github/actions/upload_test_artifacts
with:
test_artifacts_key: ${{ inputs.test_artifacts_key }}
upload_on_host_test_artifacts: ${{ inputs.upload_on_host_test_artifacts }}
upload_on_host_test_artifacts: ${{ inputs.upload_on_host_test_artifacts == 'true' || inputs.upload_web_test_artifacts == 'true' }}
upload_on_device_test_artifacts: ${{ inputs.upload_on_device_test_artifacts }}
test_targets_json_file: ${{ inputs.test_targets_json_file }}
test_targets_json: ${{ steps.calculate-test-targets.outputs.test_targets_json }}
26 changes: 25 additions & 1 deletion .github/actions/depot_tools/action.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: Set Up Depot Tools
description: Sets up Depot Tools and initializes gclient.
inputs:
run_sync:
description: "Whether or not to run gclient sync."
default: "true"
runs:
using: "composite"
steps:
Expand All @@ -13,8 +17,27 @@ runs:
- name: Add depot tools to PATH
run: echo "$GITHUB_WORKSPACE/depot_tools" >> $GITHUB_PATH
shell: bash
- name: Set GIT_CACHE_PATH
run: export GIT_CACHE_PATH=/gclient-sync-cache
shell: bash
# - name: Write test if doesn't exist
# run: touch /gclient-sync-cache/helloworld.txt
# shell: bash
- name: Write test if doesn't exist
run: |
ls -la /
ls -la /gclient-sync-cache
echo "0" >> /gclient-sync-cache/helloworld.txt
ls -la /gclient-sync-cache
shell: bash
- name: See whats there
run: ls /gclient-sync-cache
shell: bash
- name: Testing writing
run: sed -i 's/\([0-9]\+\)/$((\1+1))/g' /gclient-sync-cache/helloworld.txt && sleep 1000000
shell: bash
- name: Generate gclient file
run: gclient config --name=src --custom-var=download_remoteexec_cfg=True --custom-var='rbe_instance="projects/cobalt-actions-prod/instances/default_instance"' https://github.com/${{ github.repository }}
run: gclient config --cache-dir=/gclient-sync-cache --name=src --custom-var=download_remoteexec_cfg=True --custom-var='rbe_instance="projects/cobalt-actions-prod/instances/default_instance"' https://github.com/${{ github.repository }}
shell: bash
- name: Set target OS for Android
if: ${{ contains(matrix.platform, 'android') }}
Expand All @@ -23,6 +46,7 @@ runs:
gclient validate
shell: bash
- name: gclient sync
if: inputs.run_sync == 'true'
run: gclient sync -v --shallow --no-history -r ${{ github.sha }} --cache-dir=/gclient-sync-cache
shell: bash
- name: Disable Chromium client side build telemetry
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/docker/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ runs:
run: |
docker push ${DOCKER_TAG}
docker push ${DOCKER_FLOATING_TAG}
shell: bash
shell: bash
2 changes: 1 addition & 1 deletion .github/actions/on_device_tests/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ runs:
# Test results (xml and logs) must be in a subfolder in results_dir
# to be picked up by the test result processor.
mkdir -p "${test_output}/${{ matrix.platform }}"
gsutil cp -r "${{ inputs.gcs_results_path }}/" "${test_output}/${{ matrix.platform }}"
gsutil -q cp -r "${{ inputs.gcs_results_path }}/" "${test_output}/${{ matrix.platform }}"
shell: bash
- name: Archive Test Results
uses: actions/upload-artifact@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/print_logs/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,14 @@ runs:
"${GITHUB_WORKSPACE}/src/out/${{ matrix.platform }}_${{ matrix.config }}/lib.unstripped/
shell: bash
- run: |
set -x
# Enable globstar shell option for globstar paths e.g. /**/*.xml and
# nullopt to returns empty string if the glob matches no files.
shopt -s globstar nullglob

log_files=(${{ inputs.logfile_glob }})

if [ ${#log_files[@]} -eq 0 ]; then
echo "::error::No log files were collected."
echo "::error::No log files were collected. The tests probably failed to run."
exit 1
else
for log_file in ${log_files[@]}; do
Expand All @@ -50,6 +49,7 @@ runs:
# TODO: stack.py fails import packages. Perhaps needs depot tools setup?
cat ../${log_file} | python3 third_party/android_platform/development/scripts/stack.py --pass-through --output-directory out/${{ matrix.platform }}_${{ matrix.config }}/
else
echo "=== ${log_file} ==="
cat ${log_file}
fi
done
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/process_test_results/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ inputs:
required: true
datadog_api_key:
description: "Path to directory where test results are saved."
required: true
default: ''
results_path:
description: "Path (or glob) to test result xml files."
required: true
Expand Down
8 changes: 5 additions & 3 deletions .github/actions/upload_test_artifacts/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ inputs:
test_artifacts_key:
description: "Artifact key used to store on-host test artifacts."
required: true
test_targets_json_file:
description: "File containing the test target json."
test_targets_json:
description: "The test targets as a json list."
required: true
runs:
using: "composite"
steps:
- name: Archive Test Artifacts
env:
TEST_TARGETS_JSON: ${{ inputs.test_targets_json }}
run: |
set -x
mkdir ${GITHUB_WORKSPACE}/artifacts
Expand All @@ -27,7 +29,7 @@ runs:
--out-dir out/${{ matrix.platform }}_${{ matrix.config }}/ \
--destination-dir ${GITHUB_WORKSPACE}/artifacts \
--platform ${{ matrix.platform }} \
--targets $(cat "${{ inputs.test_targets_json_file }}" | jq -cr '.test_targets | join(",")')
--targets $(echo "${TEST_TARGETS_JSON}" | jq -cr 'join(",")')
shell: bash
- name: Upload On-Host Test Artifacts Archive
if: inputs.upload_on_host_test_artifacts == 'true'
Expand Down
56 changes: 56 additions & 0 deletions .github/actions/web_tests/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Web Tests
description: Runs Blink Web Tests.
inputs:
test_artifacts_key:
description: "Artifact key used to store test artifacts."
required: true
test_results_key:
description: "Artifact key used to store test results."
required: true
runs:
using: "composite"
steps:
- name: Download Artifacts
uses: actions/download-artifact@v4
with:
name: ${{ inputs.test_artifacts_key }}
- name: Extract Artifacts
shell: bash
run: |
set -x
# The web tests fail when not run from the source folder. Use the existing checkout.
cd src/
tar xf ../test_artifacts.tar.gz
- name: Run Web Tests
id: run-tests
shell: bash
env:
# TODO: Once fixed this should be expanded to include more tests.
TEST_PATH: wpt_internal/cobalt/crash-log
run: |
set -x
env
cd src/

# Web-tests expect dump_syms and minidump_stackwalk to be present at the root of the out folder.
out_dir="out/${{ matrix.platform}}_${{ matrix.config }}"
cp ${out_dir}/clang_x64/{dump_syms,minidump_stackwalk} ${out_dir}/

RESULTS_DIR="out/${{ matrix.platform}}_${{ matrix.config }}/layout-test-results"
echo "RESULTS_DIR=${RESULTS_DIR}" >> $GITHUB_ENV

third_party/blink/tools/run_web_tests.py \
--driver-logging \
--additional-driver-flag="--no-sandbox" \
--debug \
--no-show-results \
--target ${{ matrix.platform}}_${{ matrix.config }} \
${TEST_PATH}

echo "Finished running tests..."
- name: Archive Test Results
if: always() && contains(fromJson('["success", "failed"]'), steps.run-tests.outcome)
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.test_results_key }}
path: src/${{ env.RESULTS_DIR }}/*
28 changes: 11 additions & 17 deletions .github/workflows/label-cherry-pick.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,24 +112,18 @@ jobs:
${{ github.event.pull_request.body }}

- name: Comment on failure
if: steps.create-pr.outputs.pull-request-number == ''
uses: actions/github-script@v6
with:
github-token: ${{ secrets.CHERRY_PICK_TOKEN }}
script: |
if ('${{ steps.create-pr.outputs.pull-request-number }}' == '') {
// Comment on the originating PR if creating a cherry pick PR failed.
github.rest.issues.createComment({
issue_number: context.payload.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: '> [!IMPORTANT]\n> Creating the cherry pick PR failed! Check the log at ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} for details.'
});
} else if ('${{ steps.cherry-pick.outcome }}' == 'failure') {
// Comment on the new PR if the cherry pick failed.
github.rest.issues.createComment({
issue_number: '${{ steps.create-pr.outputs.pull-request-number }}',
owner: context.repo.owner,
repo: context.repo.repo,
body: '> [!IMPORTANT]\n> There were merge conflicts while cherry picking! Check out [${{ env.CHERRY_PICK_BRANCH }}](${{ github.repository }}/tree/${{ env.CHERRY_PICK_BRANCH }}) and fix the conflicts before proceeding. Check the log at ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} for details.'
});
}
// Comment on the originating PR if creating a cherry pick PR failed.
github.rest.issues.createComment({
issue_number: context.payload.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: '> [!IMPORTANT]\n> Creating the cherry pick PR failed! Check the log at ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} for details.'
});
- name: Post review
if: steps.cherry-pick.outcome == 'failure' && steps.create-pr.outputs.pull-request-number != ''
run: gh pr review 123 -r -b "> [!IMPORTANT]\n> There were merge conflicts while cherry picking! Check out [${{ env.CHERRY_PICK_BRANCH }}](${{ github.repository }}/tree/${{ env.CHERRY_PICK_BRANCH }}) and fix the conflicts before proceeding. Check the log at ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} for details."
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
lint:
name: Pre-Commit
runs-on: ubuntu-latest
timeout-minutes: 10
timeout-minutes: 20
steps:
- name: Install pre-commit
run: |
Expand Down
Loading
Loading