From 38553415880684a43aac4a263b2f127e8be17340 Mon Sep 17 00:00:00 2001 From: "Satadru Pramanik, DO, MPH, MEng" Date: Wed, 11 Dec 2024 13:39:57 -0500 Subject: [PATCH] vte => 0.78.2, workflow adjustments (#10931) Signed-off-by: Satadru Pramanik --- .github/workflows/Build.yml | 88 ++++++++++++++++++++++++++++++--- .github/workflows/Unit-Test.yml | 21 ++++++-- manifest/armv7l/v/vte.filelist | 3 +- manifest/x86_64/v/vte.filelist | 3 +- packages/vte.rb | 8 +-- 5 files changed, 102 insertions(+), 21 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 6bfbade5f..aa1ae0460 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -76,22 +76,83 @@ jobs: env: MATRIX_CONTEXT: ${{ toJson(matrix) }} run: echo "$MATRIX_CONTEXT" + - name: Get all changed package files + id: changed-ruby-files + uses: tj-actions/changed-files@v45 + with: + base_sha: master + files: packages/*.rb + - name: Export variables to github context + run: | + # Convert "packages/foo.rb packages/bar.rb" (from steps.changed-ruby-files.outputs.all_changed_files) into "foo bar" + echo "CHANGED_PACKAGES=$(echo "${{ steps.changed-ruby-files.outputs.all_changed_files }}" | xargs basename -s .rb | xargs)" >> $GITHUB_ENV + - name: Determine glibc and architecture package compatibility + run: | + # If a package doesnt have a min_glibc value, or if it is below 2.32, add it to GLIBC_232_COMPATIBLE_PACKAGES. + export GLIBC_232_COMPATIBLE_PACKAGES="$(for i in ${CHANGED_PACKAGES} ; do grep min_glibc packages/${i}.rb | tr -d \' | awk '{exit $2 <= 2.32}' || echo ${i} ; done | xargs)" + if [[ -n ${GLIBC_232_COMPATIBLE_PACKAGES} ]]; then + echo "GLIBC_232_COMPATIBLE_PACKAGES=${GLIBC_232_COMPATIBLE_PACKAGES}" >> $GITHUB_ENV + echo "Branch ${{ github.ref_name }} has these possibly Glibc 2.32 compatible packages: ${GLIBC_232_COMPATIBLE_PACKAGES}" + fi + + # If a package doesnt have a min_glibc value, or if it is below 2.37, add it to GLIBC_237_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)" + if [[ -n ${GLIBC_237_COMPATIBLE_PACKAGES} ]]; then + echo "GLIBC_237_COMPATIBLE_PACKAGES=${GLIBC_237_COMPATIBLE_PACKAGES}" >> $GITHUB_ENV + echo "Branch ${{ github.ref_name }} has these possibly Glibc 2.37 compatible packages: ${GLIBC_237_COMPATIBLE_PACKAGES}" + fi + + # If a package has a compatibility of 'all' or one that includes 'x86_64', add it to x86_64_PACKAGES. + export x86_64_PACKAGES="$(for i in ${CHANGED_PACKAGES}; do grep -q "[[:space:]]compatibility.*all\|[[:space:]]compatibility.*x86_64" packages/${i}.rb && echo ${i}; done | xargs)" + if [[ -n ${x86_64_PACKAGES} ]]; then + echo "x86_64_PACKAGES=${x86_64_PACKAGES}" >> $GITHUB_ENV + echo "Branch ${{ github.ref_name }} has these x86_64 compatible packages: ${x86_64_PACKAGES}" + fi + + ## If a package has a compatibility of 'all' or one that includes 'armv7l', add it to ARMV7L_PACKAGES. + export ARMV7L_PACKAGES="$(for i in ${CHANGED_PACKAGES}; do grep -q "[[:space:]]compatibility.*all\|[[:space:]]compatibility.*armv7l" packages/${i}.rb && echo ${i}; done | xargs)" + if [[ -n ${ARMV7L_PACKAGES} ]]; then + echo "ARMV7L_PACKAGES=${ARMV7L_PACKAGES}" >> $GITHUB_ENV + echo "Branch ${{ github.ref_name }} has these armv7l compatible packages: ${ARMV7L_PACKAGES}" + fi + + ## If a package has a compatibility of 'all' or one that includes 'i686', add it to i686_PACKAGES. + export i686_PACKAGES="$(for i in ${CHANGED_PACKAGES}; do grep -q "[[:space:]]compatibility.*all\|[[:space:]]compatibility.*i686" packages/${i}.rb && echo ${i}; done | xargs)" + if [[ -n ${i686_PACKAGES} ]]; then + echo "i686_PACKAGES=${i686_PACKAGES}" >> $GITHUB_ENV + echo "Branch ${{ github.ref_name }} has these i686 compatible packages: ${i686_PACKAGES}" + fi - name: Export target docker container to github context env: TARGET_ARCH: ${{ matrix.arch }} run: | - case $TARGET_ARCH in + case $TARGET_ARCH in x86_64) - echo "CONTAINER=nocturne-x86_64.m90" >> $GITHUB_ENV + # Export the x86_64 container depending on whether this branch updates packages with appropriate minimum glibc. + if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then + echo "CONTAINER=nocturne-x86_64.m97" >> $GITHUB_ENV + elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then + echo "CONTAINER=hatch-x86_64.m130" >> $GITHUB_ENV + else + echo "CONTAINER=nocturne-x86_64.m90" >> $GITHUB_ENV + fi echo "PLATFORM=linux/amd64" >> $GITHUB_ENV echo "LIB_SUFFIX=64" >> $GITHUB_ENV ;; armv7l) - echo "CONTAINER=fievel-armv7l.m91" >> $GITHUB_ENV + # Export the armv7l container depending on whether this branch updates packages with appropriate minimum glibc. + if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then + echo "CONTAINER=fievel-armv7l.m97" >> $GITHUB_ENV + elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then + echo "CONTAINER=strongbad-armv7l.m130" >> $GITHUB_ENV + else + echo "CONTAINER=fievel-armv7l.m91" >> $GITHUB_ENV + fi echo "PLATFORM=linux/arm/v7" >> $GITHUB_ENV echo "LIB_SUFFIX=" >> $GITHUB_ENV ;; i686) + # There is only one i686 container based upon M58 with glibc 2.23. echo "CONTAINER=alex-i686.m58" >> $GITHUB_ENV echo "PLATFORM=linux/386" >> $GITHUB_ENV echo "LIB_SUFFIX=" >> $GITHUB_ENV @@ -104,11 +165,25 @@ jobs: CREW_REPO: ${{ github.event.repository.clone_url }} CREW_BRANCH: ${{ github.ref_name }} run: | + if ([ "$PLATFORM" == 'linux/arm/v7' ] && [ -z "${ARMV7L_PACKAGES}" ]); then + # Exit the arm container if there are not armv7l compatible packages. + echo "Skipping armv7l container builds." + exit 0 + elif ([ "$PLATFORM" == 'linux/amd64' ] && [ -z "${x86_64_PACKAGES}" ]); then + # Exit the x86_64 container if there are not x86_64 compatible packages. + echo "Skipping x86_64 container builds." + exit 0 + elif ([ "$PLATFORM" == 'linux/386' ] && [ -z "${i686_PACKAGES}" ]); then + # Exit the i686 container if there are not i686 compatible packages. + echo "Skipping i686 container builds." + exit 0 + fi + git pull && git checkout ${CREW_BRANCH} docker pull --platform ${PLATFORM} satmandu/crewbuild:${CONTAINER} sudo apt install -y acl sudo setfacl -R -m u:1000:rwx . - # getfacl . + # Use docker-in-docker shim to mount volume inside docker. # docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \ # ghcr.io/felipecrs/dond-shim:latest \ @@ -130,7 +205,7 @@ jobs: /bin/chromebrewstart /output/tools/github_actions_update_builder.sh > >(tee -a /tmp/build.log) 2> >(tee -a /tmp/build.log >&2) grep "Built and Uploaded:" /tmp/build.log || true sudo rm -rf release - - name: Add updated packages to PR. + - name: Add updated packages to branch. id: push-check env: UPDATE_BRANCH_NAME: ${{ github.ref_name }} @@ -190,6 +265,3 @@ jobs: export PR_NUMBER=$(gh pr create --title "Automatic PR to build packages for ${{ github.ref_name }} on ${{ needs.setup.outputs.output1 }}" -F /tmp/pr.txt | rev | cut -d"/" -f1 | rev) echo "PR_NUMBER is ${PR_NUMBER}" echo "PR_NUMBER=${PR_NUMBER}" >> $GITHUB_ENV - - name: Trigger Unit Test workflow. - run: | - gh workflow run "Unit-Test.yml" --ref ${{ github.ref_name }} diff --git a/.github/workflows/Unit-Test.yml b/.github/workflows/Unit-Test.yml index 10860181f..6a73d401f 100644 --- a/.github/workflows/Unit-Test.yml +++ b/.github/workflows/Unit-Test.yml @@ -84,7 +84,14 @@ jobs: echo "PR #${{ github.event.pull_request.number }} has these possibly Glibc 2.27 compatible packages: ${GLIBC_227_COMPATIBLE_PACKAGES}" fi - # If a package doesnt have a min_glibc value, or if its below 2.37, add it to GLIBC_237_COMPATIBLE_PACKAGES. + # If a package doesnt have a min_glibc value, or if it is below 2.32, add it to GLIBC_232_COMPATIBLE_PACKAGES. + export GLIBC_232_COMPATIBLE_PACKAGES="$(for i in ${CHANGED_PACKAGES} ; do grep min_glibc packages/${i}.rb | tr -d \' | awk '{exit $2 <= 2.32}' || echo ${i} ; done | xargs)" + if [[ -n ${GLIBC_232_COMPATIBLE_PACKAGES} ]]; then + echo "GLIBC_232_COMPATIBLE_PACKAGES=${GLIBC_232_COMPATIBLE_PACKAGES}" >> $GITHUB_ENV + echo "Branch ${{ github.ref_name }} has these possibly Glibc 2.32 compatible packages: ${GLIBC_232_COMPATIBLE_PACKAGES}" + fi + + # If a package doesnt have a min_glibc value, or if it is below 2.37, add it to GLIBC_237_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)" if [[ -n ${GLIBC_237_COMPATIBLE_PACKAGES} ]]; then echo "GLIBC_237_COMPATIBLE_PACKAGES=${GLIBC_237_COMPATIBLE_PACKAGES}" >> $GITHUB_ENV @@ -117,8 +124,10 @@ jobs: run: | case $TARGET_ARCH in x86_64) - # Export the x86_64 container depending on whether this PR updates packages with a minimum glibc greater than or equal to 2.37. - if [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then + # Export the x86_64 container depending on whether this PR updates packages with appropriate minimum glibc. + if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then + echo "CONTAINER=nocturne-x86_64.m97" >> $GITHUB_ENV + elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then echo "CONTAINER=hatch-x86_64.m130" >> $GITHUB_ENV else echo "CONTAINER=nocturne-x86_64.m90" >> $GITHUB_ENV @@ -127,8 +136,10 @@ jobs: echo "LIB_SUFFIX=64" >> $GITHUB_ENV ;; armv7l) - # Export the armv7l container depending on whether this PR updates packages with a minimum glibc greater than or equal to 2.37. - if [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then + # Export the armv7l container depending on whether this PR updates packages with appropriate minimum glibc. + if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then + echo "CONTAINER=fievel-armv7l.m97" >> $GITHUB_ENV + elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then echo "CONTAINER=strongbad-armv7l.m130" >> $GITHUB_ENV else echo "CONTAINER=fievel-armv7l.m91" >> $GITHUB_ENV diff --git a/manifest/armv7l/v/vte.filelist b/manifest/armv7l/v/vte.filelist index b332e572a..2341d9fbb 100644 --- a/manifest/armv7l/v/vte.filelist +++ b/manifest/armv7l/v/vte.filelist @@ -30,7 +30,7 @@ /usr/local/lib/libvte-2.91-gtk4.so.0 /usr/local/lib/libvte-2.91.so /usr/local/lib/libvte-2.91.so.0 -/usr/local/lib/libvte-2.91.so.0.7791.0 +/usr/local/lib/libvte-2.91.so.0.7800.2 /usr/local/lib/pkgconfig/vte-2.91-gtk4.pc /usr/local/lib/pkgconfig/vte-2.91.pc /usr/local/libexec/vte-urlencode-cwd @@ -136,4 +136,3 @@ /usr/local/share/locale/zh_CN/LC_MESSAGES/vte-2.91.mo /usr/local/share/locale/zh_HK/LC_MESSAGES/vte-2.91.mo /usr/local/share/locale/zh_TW/LC_MESSAGES/vte-2.91.mo -/usr/local/share/vte-2.91/terminfo/x/xterm-256color diff --git a/manifest/x86_64/v/vte.filelist b/manifest/x86_64/v/vte.filelist index 4c745aa53..1c6fb001a 100644 --- a/manifest/x86_64/v/vte.filelist +++ b/manifest/x86_64/v/vte.filelist @@ -30,7 +30,7 @@ /usr/local/lib64/libvte-2.91-gtk4.so.0 /usr/local/lib64/libvte-2.91.so /usr/local/lib64/libvte-2.91.so.0 -/usr/local/lib64/libvte-2.91.so.0.7791.0 +/usr/local/lib64/libvte-2.91.so.0.7800.2 /usr/local/lib64/pkgconfig/vte-2.91-gtk4.pc /usr/local/lib64/pkgconfig/vte-2.91.pc /usr/local/libexec/vte-urlencode-cwd @@ -136,4 +136,3 @@ /usr/local/share/locale/zh_CN/LC_MESSAGES/vte-2.91.mo /usr/local/share/locale/zh_HK/LC_MESSAGES/vte-2.91.mo /usr/local/share/locale/zh_TW/LC_MESSAGES/vte-2.91.mo -/usr/local/share/vte-2.91/terminfo/x/xterm-256color diff --git a/packages/vte.rb b/packages/vte.rb index 382bfc2a7..c81b8e073 100644 --- a/packages/vte.rb +++ b/packages/vte.rb @@ -3,7 +3,7 @@ require 'buildsystems/meson' class Vte < Meson description 'Virtual Terminal Emulator widget for use with GTK' homepage 'https://wiki.gnome.org/Apps/Terminal/VTE' - version "0.77.91-#{CREW_ICU_VER}" + version "0.78.2-#{CREW_ICU_VER}" license 'LGPL-2+ and GPL-3+' compatibility 'x86_64 aarch64 armv7l' source_url 'https://gitlab.gnome.org/GNOME/vte.git' @@ -11,9 +11,9 @@ class Vte < Meson binary_compression 'tar.zst' binary_sha256({ - aarch64: 'd4516db006795e505a81fb52c34803fc6b0eea01a16bbbec03fd0f6546ba604f', - armv7l: 'd4516db006795e505a81fb52c34803fc6b0eea01a16bbbec03fd0f6546ba604f', - x86_64: 'f983e3b3731e062c5e0719ae5886cfb3dadb7d45ddea9ea8a22c5f07ce65a7a8' + aarch64: '1e4976f63cc6c1986e9bc1e243ac6a543b5c340e54b1da2b4451481cdeb07f55', + armv7l: '1e4976f63cc6c1986e9bc1e243ac6a543b5c340e54b1da2b4451481cdeb07f55', + x86_64: 'e656fe422f27715cd70be71b5df9c5e851b9e5eb01d07262bce2d65bc2ba6725' }) depends_on 'at_spi2_core' # R