mirror of
https://github.com/chromebrew/chromebrew.git
synced 2026-01-08 23:18:10 -05:00
Edge 127.0.2651.98-1 => 127.0.2651.105-1 (#10316)
* Edge 127.0.2651.98-1 => 127.0.2651.105-1 * Adjust Unit Test workflow to account for min_glibc. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust Unit Test workflow to account for min_glibc: take 2. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust min_glibc of Google Chrome packages to 2.28, adjust unit test runner to use higher milestone ChromeOS based containers when appropriate. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust unit test workflow to set LD_LIBRARY_PATH in bash path. Signed-off-by: Satadru Pramanik <satadru@gmail.com> --------- Signed-off-by: Satadru Pramanik <satadru@gmail.com> Co-authored-by: Satadru Pramanik <satadru@gmail.com>
This commit is contained in:
Ed Reel
62
.github/workflows/Unit-Test.yml
vendored
62
.github/workflows/Unit-Test.yml
vendored
@@ -5,7 +5,7 @@ jobs:
|
||||
container_tests:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v4.1.7
|
||||
- name: Dump github context
|
||||
run: echo "$GITHUB_CONTEXT"
|
||||
shell: bash
|
||||
@@ -28,21 +28,30 @@ jobs:
|
||||
echo "ALL_CHANGED FILES is/are ${ALL_CHANGED_FILES}." && \
|
||||
export CHANGED_PACKAGES="$(echo ${ALL_CHANGED_FILES} | sed -e 's,packages/,,g' -e 's,\.rb,,g' | sort)" && \
|
||||
echo "CHANGED PACKAGES is/are ${CHANGED_PACKAGES}." && \
|
||||
export X86_64_PACKAGES="$(for p in ${CHANGED_PACKAGES}; do grep -q "compatibility.*all\|x86_64" packages/$p.rb && echo $p; done | xargs)" && \
|
||||
export GLIBC_227_COMPATIBLE_PACKAGES="$(for i in ${CHANGED_PACKAGES} ; do if ! grep -q min_glibc packages/$i.rb; then echo $i ; else grep min_glibc packages/$i.rb | tr -d \' | awk '{exit $2 < 2.27}' || echo $i ; fi ; done | xargs)" && \
|
||||
echo "PR #${PR_NUMBER} has these Glibc 2.27 compatible packages: ${GLIBC_227_COMPATIBLE_PACKAGES}" && \
|
||||
export GLIBC_237_COMPATIBLE_PACKAGES="$(for i in ${CHANGED_PACKAGES} ; do grep min_glibc packages/$i.rb | tr -d \' | awk '{exit $2 < 2.37}' || echo $i ; done | xargs)" && \
|
||||
echo "PR #${PR_NUMBER} has these Glibc 2.37 compatible packages: ${GLIBC_237_COMPATIBLE_PACKAGES}" && \
|
||||
export X86_64_PACKAGES="$(for p in ${CHANGED_PACKAGES}; do grep -q "compatibility.*all\|x86_64" packages/${p}.rb && echo ${p}; done | xargs)" && \
|
||||
echo "PR #${PR_NUMBER} has these x86_64 compatible packages: ${X86_64_PACKAGES}" && \
|
||||
export ARMV7L_PACKAGES="$(for p in ${CHANGED_PACKAGES}; do grep -q "compatibility.*all\|armv7l" packages/$p.rb && echo $p; done | xargs)" && \
|
||||
export ARMV7L_PACKAGES="$(for p in ${CHANGED_PACKAGES}; do grep -q "compatibility.*all\|armv7l" packages/${p}.rb && echo ${p}; done | xargs)" && \
|
||||
echo "PR #${PR_NUMBER} has these ARMv7L compatible packages: ${ARMV7L_PACKAGES}" && \
|
||||
sudo docker run --rm \
|
||||
--platform linux/amd64 -i satmandu/crewbuild:nocturne-x86_64.m90 \
|
||||
sudo -i -u chronos /bin/bash -c " \
|
||||
export ALL_CHANGED_FILES=\"${ALL_CHANGED_FILES}\" && \
|
||||
export CHANGED_PACKAGES=\"${CHANGED_PACKAGES}\" && \
|
||||
echo \"CREW_REPO is ${{ github.event.pull_request.head.repo.clone_url }}\" && \
|
||||
echo \"CREW_BRANCH is ${{ github.head_ref }}\" && \
|
||||
if [[ $GLIBC_237_COMPATIBLE_PACKAGES ]] ; then x86_64_CONTAINER="satmandu/crewbuild:hatch-x86_64.m126"; else x86_64_CONTAINER="satmandu/crewbuild:nocturne-x86_64.m90"; fi &&\
|
||||
export container_cmdline="/usr/bin/sudo -u chronos LD_LIBRARY_PATH=/usr/local/lib64:/lib64 /usr/local/bin/bash -c \"export ALL_CHANGED_FILES='${ALL_CHANGED_FILES}' && \
|
||||
export CHANGED_PACKAGES='${CHANGED_PACKAGES}' && \
|
||||
echo 'ALL_CHANGED FILES is/are ${ALL_CHANGED_FILES}.' && \
|
||||
echo 'CHANGED PACKAGES is/are ${CHANGED_PACKAGES}.' && \
|
||||
echo 'CREW_REPO is ${{ github.event.pull_request.head.repo.clone_url }}' && \
|
||||
echo 'CREW_BRANCH is ${{ github.head_ref }}' && \
|
||||
CREW_REPO=${{ github.event.pull_request.head.repo.clone_url }} CREW_BRANCH=${{ github.head_ref }} crew update && \
|
||||
/usr/local/lib/crew/tests/unit_test.sh"
|
||||
/usr/local/lib/crew/tests/unit_test.sh\"" && \
|
||||
echo $container_cmdline && \
|
||||
sudo docker run --rm \
|
||||
--platform linux/amd64 \
|
||||
-i ${x86_64_CONTAINER} \
|
||||
/bin/bash -c "$container_cmdline"
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v3
|
||||
uses: docker/setup-qemu-action@v3.2.0
|
||||
# This is not the best way to do things, a matrix would certainly be better.
|
||||
- name: Unit Tests (armv7l)
|
||||
env:
|
||||
@@ -52,17 +61,26 @@ jobs:
|
||||
echo "ALL_CHANGED FILES is/are ${ALL_CHANGED_FILES}." && \
|
||||
export CHANGED_PACKAGES="$(echo ${ALL_CHANGED_FILES} | sed -e 's,packages/,,g' -e 's,\.rb,,g' | sort)" && \
|
||||
echo "CHANGED PACKAGES is/are ${CHANGED_PACKAGES}." && \
|
||||
export X86_64_PACKAGES="$(for p in ${CHANGED_PACKAGES}; do grep -q "compatibility.*all\|x86_64" packages/$p.rb && echo $p; done | xargs)" && \
|
||||
export GLIBC_227_COMPATIBLE_PACKAGES="$(for i in ${CHANGED_PACKAGES} ; do if ! grep -q min_glibc packages/$i.rb; then echo $i ; else grep min_glibc packages/$i.rb | tr -d \' | awk '{exit $2 < 2.27}' || echo $i ; fi ; done | xargs)" && \
|
||||
echo "PR #${PR_NUMBER} has these Glibc 2.27 compatible packages: ${GLIBC_227_COMPATIBLE_PACKAGES}" && \
|
||||
export GLIBC_237_COMPATIBLE_PACKAGES="$(for i in ${CHANGED_PACKAGES} ; do grep min_glibc packages/$i.rb | tr -d \' | awk '{exit $2 < 2.37}' || echo $i ; done | xargs)" && \
|
||||
echo "PR #${PR_NUMBER} has these Glibc 2.37 compatible packages: ${GLIBC_237_COMPATIBLE_PACKAGES}" && \
|
||||
export X86_64_PACKAGES="$(for p in ${CHANGED_PACKAGES}; do grep -q "compatibility.*all\|x86_64" packages/${p}.rb && echo ${p}; done | xargs)" && \
|
||||
echo "PR #${PR_NUMBER} has these x86_64 compatible packages: ${X86_64_PACKAGES}" && \
|
||||
export ARMV7L_PACKAGES="$(for p in ${CHANGED_PACKAGES}; do grep -q "compatibility.*all\|armv7l" packages/$p.rb && echo $p; done | xargs)" && \
|
||||
export ARMV7L_PACKAGES="$(for p in ${CHANGED_PACKAGES}; do grep -q "compatibility.*all\|armv7l" packages/${p}.rb && echo ${p}; done | xargs)" && \
|
||||
echo "PR #${PR_NUMBER} has these ARMv7L compatible packages: ${ARMV7L_PACKAGES}" && \
|
||||
[[ $ARMV7L_PACKAGES ]] || exit 0 && \
|
||||
sudo docker run --rm \
|
||||
--platform linux/arm/v7 -t satmandu/crewbuild:fievel-armv7l.m91 \
|
||||
sudo -i -u chronos /bin/bash -x -c " \
|
||||
export ALL_CHANGED_FILES=\"${ALL_CHANGED_FILES}\" && \
|
||||
export CHANGED_PACKAGES=\"${CHANGED_PACKAGES}\" && \
|
||||
echo \"CREW_REPO is ${{ github.event.pull_request.head.repo.clone_url }}\" && \
|
||||
echo \"CREW_BRANCH is ${{ github.head_ref }}\" && \
|
||||
if [[ $GLIBC_237_COMPATIBLE_PACKAGES ]] ; then armv7l_CONTAINER="satmandu/crewbuild:strongbad-armv7l.m126"; else armv7l_CONTAINER="satmandu/crewbuild:fievel-armv7l.m91"; fi &&\
|
||||
export container_cmdline="/usr/bin/sudo -u chronos LD_LIBRARY_PATH=/usr/lib:/lib /usr/local/bin/bash -c \"export ALL_CHANGED_FILES='${ALL_CHANGED_FILES}' && \
|
||||
export CHANGED_PACKAGES='${CHANGED_PACKAGES}' && \
|
||||
echo 'ALL_CHANGED FILES is/are ${ALL_CHANGED_FILES}.' && \
|
||||
echo 'CHANGED PACKAGES is/are ${CHANGED_PACKAGES}.' && \
|
||||
echo 'CREW_REPO is ${{ github.event.pull_request.head.repo.clone_url }}' && \
|
||||
echo 'CREW_BRANCH is ${{ github.head_ref }}' && \
|
||||
CREW_REPO=${{ github.event.pull_request.head.repo.clone_url }} CREW_BRANCH=${{ github.head_ref }} crew update && \
|
||||
/usr/local/lib/crew/tests/unit_test.sh"
|
||||
/usr/local/lib/crew/tests/unit_test.sh\"" && \
|
||||
echo $container_cmdline && \
|
||||
sudo docker run --rm \
|
||||
--platform linux/arm/v7 \
|
||||
-i ${armv7l_CONTAINER} \
|
||||
/bin/bash -c "$container_cmdline"
|
||||
|
||||
@@ -3,12 +3,12 @@ require 'package'
|
||||
class Edge < Package
|
||||
description 'Microsoft Edge is the fast and secure browser'
|
||||
homepage 'https://www.microsoft.com/en-us/edge'
|
||||
version '127.0.2651.98-1'
|
||||
version '127.0.2651.105-1'
|
||||
license 'MIT'
|
||||
compatibility 'x86_64'
|
||||
min_glibc '2.29'
|
||||
source_url "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_#{version}_amd64.deb"
|
||||
source_sha256 'a3cd208ed322982b32e3cc25ee88e3dead61376cc9abef4667338b16e7479b61'
|
||||
source_sha256 '16fa81a3296ef1e5efe7097cb6dc66b2aac1904ccc2f6b90a7145bfa892511a9'
|
||||
|
||||
depends_on 'at_spi2_core'
|
||||
depends_on 'libcom_err'
|
||||
|
||||
@@ -7,7 +7,7 @@ class Google_chrome < Package
|
||||
version '127.0.6533.119-1'
|
||||
license 'google-chrome'
|
||||
compatibility 'x86_64'
|
||||
min_glibc '2.25'
|
||||
min_glibc '2.28'
|
||||
source_url "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-#{@update_channel}/google-chrome-#{@update_channel}_#{@version}_amd64.deb"
|
||||
source_sha256 '93daec10b02d38574b4a2d5d3935782ebec4d94bb9b11d7f18e2fd0560ea665e'
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ class Google_chrome_beta < Package
|
||||
version '128.0.6613.18-1'
|
||||
license 'google-chrome'
|
||||
compatibility 'x86_64'
|
||||
min_glibc '2.25'
|
||||
min_glibc '2.28'
|
||||
source_url "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-#{@update_channel}/google-chrome-#{@update_channel}_#{@version}_amd64.deb"
|
||||
source_sha256 'ca9bce2d3c8b6b2e092f28a73af01e7d95de093108ab40609e0390d0dd1a4ba3'
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ class Google_chrome_unstable < Package
|
||||
version '129.0.6628.3-1'
|
||||
license 'google-chrome'
|
||||
compatibility 'x86_64'
|
||||
min_glibc '2.25'
|
||||
min_glibc '2.28'
|
||||
source_url "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-#{@update_channel}/google-chrome-#{@update_channel}_#{@version}_amd64.deb"
|
||||
source_sha256 '04ecad6568443416e347833cd9733b9866bb5b0465e34a93d6442eb75bc51d26'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user