AutoBuild: glib started at 2025-06-11-19UTC (#12019)

* Update gobject_instrospection and glib Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Add built packages for linux/386 to glib * Add built packages for linux/amd64 to glib * Add built packages for linux/arm/v7 to glib * Adjust workflows to use older containers. Signed-off-by: Satadru Pramanik <satadru@gmail.com> --------- Signed-off-by: Satadru Pramanik <satadru@gmail.com> Co-authored-by: Satadru Pramanik <satadru@gmail.com> Co-authored-by: satmandu <satmandu@users.noreply.github.com>
2026-01-09 23:48:01 -05:00 · 2025-06-11 15:52:03 -05:00
parent e552d0d7d6
commit e63bcf0b02
9 changed files with 42 additions and 412 deletions
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -211,7 +211,7 @@ jobs:
                # else
                #     echo "CONTAINER=nocturne-x86_64.m90" >> "$GITHUB_ENV"
                # fi
-                echo "CONTAINER=nocturne-x86_64.m90" >> "$GITHUB_ENV"
+                echo "CONTAINER=satmandu/crew-pre-glibc-standalone:nocturne-x86_64.m90" >> "$GITHUB_ENV"
                echo "PLATFORM=linux/amd64" >> "$GITHUB_ENV"
                echo "LIB_SUFFIX=64" >> "$GITHUB_ENV"
              ;;
@@ -224,13 +224,13 @@ jobs:
                # else
                #     echo "CONTAINER=fievel-armv7l.m91" >> "$GITHUB_ENV"
                # fi
-                echo "CONTAINER=fievel-armv7l.m91" >> "$GITHUB_ENV"
+                echo "CONTAINER=satmandu/crew-pre-glibc-standalone:fievel-armv7l.m91" >> "$GITHUB_ENV"
                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 "CONTAINER=satmandu/crew-pre-glibc-standalone:alex-i686.m58" >> "$GITHUB_ENV"
                echo "PLATFORM=linux/386" >> "$GITHUB_ENV"
                echo "LIB_SUFFIX=" >> "$GITHUB_ENV"
              ;;
@@ -257,7 +257,7 @@ jobs:
            git checkout "${{ env.BRANCH }}"
            git reset --hard "origin/${{ env.BRANCH }}"
            git log --oneline -10
-            docker pull --platform "${PLATFORM}" "satmandu/crew-pre-glibc-standalone:${CONTAINER}"
+            docker pull --platform "${PLATFORM}" "${CONTAINER}"
            sudo apt install -y acl
            # Detection of /output/pkg_cache dir triggers setting
            # CREW_CACHE_DIR=1 and CREW_CACHE_ENABLED=1 in the build
@@ -283,7 +283,7 @@ jobs:
              -v "$(pwd)"/pkg_cache:/usr/local/tmp/packages:rshared \
              -v "$(pwd)":/output:rshared \
              --tmpfs /tmp \
-              "satmandu/crew-pre-glibc-standalone:${CONTAINER}" \
+              "${CONTAINER}" \
              /bin/chromebrewstart "/output/tools/github_actions_update_builder${{ github.event.inputs.allow_fail == 'true' && '_allowing_failures' || ''}}.sh"  > >(tee -a /tmp/build.log) 2> >(tee -a /tmp/build.log >&2)
              grep "Built and Uploaded:" /tmp/build.log || true
              echo "Deleting build output directories."
--- a/.github/workflows/Unit-Test.yml
+++ b/.github/workflows/Unit-Test.yml
@@ -137,7 +137,7 @@ jobs:
                # else
                #     echo "CONTAINER=nocturne-x86_64.m90" >> "$GITHUB_ENV"
                # fi
-                echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m136" >> "$GITHUB_ENV"
+                echo "CONTAINER=satmandu/crew-pre-glibc-standalone:nocturne-x86_64.m90" >> "$GITHUB_ENV"
                echo "PLATFORM=linux/amd64" >> "$GITHUB_ENV"
                echo "LIB_SUFFIX=64" >> "$GITHUB_ENV"
              ;;
@@ -150,7 +150,7 @@ jobs:
                # else
                #    echo "CONTAINER=fievel-armv7l.m91" >> "$GITHUB_ENV"
                # fi
-                echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m136" >> "$GITHUB_ENV"
+                echo "CONTAINER=satmandu/crew-pre-glibc-standalone:fievel-armv7l.m91" >> "$GITHUB_ENV"
                echo "PLATFORM=linux/arm/v7" >> "$GITHUB_ENV"
                echo "LIB_SUFFIX=" >> "$GITHUB_ENV"
              ;;
--- a/.github/workflows/Updater-Build.yml
+++ b/.github/workflows/Updater-Build.yml
@@ -1,370 +0,0 @@
---
-name: Build
-on:
-  workflow_dispatch:
-    inputs:
-      with_pr:
-        description: "Create a PR after building."
-        required: false
-        type: boolean
-        default: 'true'
-      branch:
-        description: "Branch of chromebrew/chromebrew to run on, if different from this branch."
-        required: false
-env:
-  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # setting GH_TOKEN for the entire workflow
-  BRANCH: ${{ inputs.branch || github.ref_name }}
-permissions:
-  actions: write
-  contents: write
-  packages: write
-  pull-requests: write
-  repository-projects: read
-jobs:
-  debug:
-    if: ${{ ( github.repository_owner == 'chromebrew' ) }}
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Dump GitHub context
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: echo "$GITHUB_CONTEXT"
-      - name: Dump job context
-        env:
-          JOB_CONTEXT: ${{ toJson(job) }}
-        run: echo "$JOB_CONTEXT"
-      - name: Dump steps context
-        env:
-          STEPS_CONTEXT: ${{ toJson(steps) }}
-        run: echo "$STEPS_CONTEXT"
-  setup:
-    if: ${{ ( github.repository_owner == 'chromebrew' ) && ( inputs.branch != 'master' ) }}
-    runs-on: ubuntu-24.04
-    outputs:
-      timestamp: ${{ steps.set-timestamp.outputs.TIMESTAMP }}  # https://stackoverflow.com/a/75142892
-      changed_packages: ${{ steps.changed-packages.outputs.CHANGED_PACKAGES }}
-      glibc_232_compat: ${{ steps.get-compatibility.outputs.GLIBC_232_COMPATIBLE_PACKAGES }}
-      glibc_237_compat: ${{ steps.get-compatibility.outputs.GLIBC_237_COMPATIBLE_PACKAGES }}
-      i686_packages: ${{ steps.get-compatibility.outputs.i686_PACKAGES }}
-      x86_64_packages: ${{ steps.get-compatibility.outputs.x86_64_PACKAGES }}
-      armv7l_packages: ${{ steps.get-compatibility.outputs.armv7l_PACKAGES }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          persist-credentials: true
-          ref: ${{ inputs.branch || github.ref_name }}
-      - name: Rebase to master
-        run: |
-            git config user.name "${{ github.actor }}"
-            git config user.email "${{ github.actor }}@users.noreply.github.com"
-            git pull --rebase origin master
-            git push -f
-      - name: Push rebase changes
-        uses: ad-m/github-push-action@master
-        with:
-          branch: ${{ env.BRANCH }}
-          force: true
-      - name: Set Timestamp
-        id: set-timestamp
-        run: |
-          TIMESTAMP="$(date -u +%F-%H%Z)"
-          export TIMESTAMP
-          echo "TIMESTAMP=${TIMESTAMP}" >> "$GITHUB_OUTPUT"
-      - name: Get all changed package files
-        id: changed-ruby-files
-        uses: tj-actions/changed-files@v45
-        with:
-          base_sha: master
-          files: packages/*.rb
-          since_last_remote_commit: true
-      - name: Export variables to github context
-        id: changed-packages
-        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"
-            echo "CHANGED_PACKAGES=$(echo "${{ steps.changed-ruby-files.outputs.all_changed_files }}" | xargs basename -s .rb | xargs)" >> "$GITHUB_OUTPUT"
-      - name: Determine glibc and architecture package compatibility
-        id: get-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.
-            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)"
-            export GLIBC_232_COMPATIBLE_PACKAGES
-            if [[ -n ${GLIBC_232_COMPATIBLE_PACKAGES} ]]; then
-              echo "GLIBC_232_COMPATIBLE_PACKAGES=${GLIBC_232_COMPATIBLE_PACKAGES}" >> "$GITHUB_ENV"
-              echo "GLIBC_232_COMPATIBLE_PACKAGES=${GLIBC_232_COMPATIBLE_PACKAGES}" >> "$GITHUB_OUTPUT"
-              echo "Branch ${{ env.BRANCH }} 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.
-            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)"
-            export GLIBC_237_COMPATIBLE_PACKAGES
-            if [[ -n ${GLIBC_237_COMPATIBLE_PACKAGES} ]]; then
-              echo "GLIBC_237_COMPATIBLE_PACKAGES=${GLIBC_237_COMPATIBLE_PACKAGES}" >> "$GITHUB_ENV"
-              echo "GLIBC_237_COMPATIBLE_PACKAGES=${GLIBC_237_COMPATIBLE_PACKAGES}" >> "$GITHUB_OUTPUT"
-              echo "Branch ${{ env.BRANCH }} 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.
-            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)"
-            export x86_64_PACKAGES
-            if [[ -n ${x86_64_PACKAGES} ]]; then
-              echo "x86_64_PACKAGES=${x86_64_PACKAGES}" >> "$GITHUB_ENV"
-              echo "x86_64_PACKAGES=${x86_64_PACKAGES}" >> "$GITHUB_OUTPUT"
-              echo "Branch ${{ env.BRANCH }} 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.
-            armv7l_PACKAGES="$(for i in ${CHANGED_PACKAGES}; do grep -q "[[:space:]]compatibility.*all\|[[:space:]]compatibility.*armv7l" packages/"${i}".rb && echo "${i}"; done | xargs)"
-            export armv7l_PACKAGES
-            if [[ -n ${armv7l_PACKAGES} ]]; then
-              echo "armv7l_PACKAGES=${armv7l_PACKAGES}" >> "$GITHUB_ENV"
-              echo "armv7l_PACKAGES=${armv7l_PACKAGES}" >> "$GITHUB_OUTPUT"
-              echo "Branch ${{ env.BRANCH }} 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.
-            i686_PACKAGES="$(for i in ${CHANGED_PACKAGES}; do grep -q "[[:space:]]compatibility.*all\|[[:space:]]compatibility.*i686" packages/"${i}".rb && echo "${i}"; done | xargs)"
-            export i686_PACKAGES
-            if [[ -n ${i686_PACKAGES} ]]; then
-              echo "i686_PACKAGES=${i686_PACKAGES}" >> "$GITHUB_ENV"
-              echo "i686_PACKAGES=${i686_PACKAGES}" >> "$GITHUB_OUTPUT"
-              echo "Branch ${{ env.BRANCH }} has these i686 compatible packages: ${i686_PACKAGES}"
-            fi
-  generate:
-    strategy:
-      max-parallel: 1
-      matrix:
-        arch: [i686, x86_64, armv7l]
-        runner:
-          - ubuntu-24.04
-          - ubuntu-24.04-arm
-        exclude:
-          - arch: x86_64
-            runner: ubuntu-24.04-arm
-          - arch: i686
-            runner: ubuntu-24.04-arm
-          - arch: armv7l
-            runner: ubuntu-24.04
-    runs-on: ${{ matrix.runner }}
-    needs: setup
-    env:
-      CREW_REPO: ${{ github.event.repository.clone_url }}
-      CREW_BRANCH: ${{ inputs.branch || github.ref_name }}
-      TARGET_ARCH: ${{ matrix.arch }}
-      TIMESTAMP: ${{ needs.setup.outputs.timestamp }}
-      GLIBC_232_COMPATIBLE_PACKAGES: ${{ needs.setup.outputs.glibc_232_compat }}
-      GLIBC_237_COMPATIBLE_PACKAGES: ${{ needs.setup.outputs.glibc_237_compat }}
-      i686_PACKAGES: ${{ needs.setup.outputs.i686_packages }}
-      x86_64_PACKAGES: ${{ needs.setup.outputs.x86_64_packages }}
-      armv7l_PACKAGES: ${{ needs.setup.outputs.armv7l_packages }}
-    if: ${{ !cancelled() }}
-    concurrency:
-      group: ${{ matrix.arch }}-${{ github.workflow }}-${{ github.ref }}
-      cancel-in-progress: true
-    steps:
-      - name: Build Container cleanup
-        run: |
-            sudo rm -rf release
-      - name: Dump GitHub context
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: echo "$GITHUB_CONTEXT"
-      - name: Dump job context
-        env:
-          JOB_CONTEXT: ${{ toJson(job) }}
-        run: echo "$JOB_CONTEXT"
-      - name: Dump steps context
-        env:
-          STEPS_CONTEXT: ${{ toJson(steps) }}
-        run: echo "$STEPS_CONTEXT"
-      - name: Dump runner context
-        env:
-          RUNNER_CONTEXT: ${{ toJson(runner) }}
-        run: echo "$RUNNER_CONTEXT"
-      - name: Dump strategy context
-        env:
-          STRATEGY_CONTEXT: ${{ toJson(strategy) }}
-        run: echo "$STRATEGY_CONTEXT"
-      - name: Dump matrix context
-        env:
-          MATRIX_CONTEXT: ${{ toJson(matrix) }}
-        run: echo "$MATRIX_CONTEXT"
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          persist-credentials: true
-      - name: Export target docker container to github context
-        run: |
-          case $TARGET_ARCH in
-              x86_64)
-                # 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.m136" >> "$GITHUB_ENV"
-                # else
-                #     echo "CONTAINER=nocturne-x86_64.m90" >> "$GITHUB_ENV"
-                # fi
-                echo "CONTAINER=nocturne-x86_64.m90" >> "$GITHUB_ENV"
-                echo "PLATFORM=linux/amd64" >> "$GITHUB_ENV"
-                echo "LIB_SUFFIX=64" >> "$GITHUB_ENV"
-              ;;
-              armv7l)
-                # 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.m136" >> "$GITHUB_ENV"
-                # else
-                #     echo "CONTAINER=fievel-armv7l.m91" >> "$GITHUB_ENV"
-                # fi
-                echo "CONTAINER=fievel-armv7l.m91" >> "$GITHUB_ENV"
-                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"
-              ;;
-            esac
-      - name: Run Updater in container
-        id: run-updater
-        if: ${{ !cancelled() }}
-        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 fetch origin
-            git checkout "${{ env.BRANCH }}"
-            git reset --hard "origin/${{ env.BRANCH }}"
-            git log --oneline -10
-            docker pull --platform "${PLATFORM}" "satmandu/crew-pre-glibc-standalone:${CONTAINER}"
-            sudo apt install -y acl
-            # Detection of /output/pkg_cache dir triggers setting
-            # CREW_CACHE_DIR=1 and CREW_CACHE_ENABLED=1 in the build
-            # container. Without these, upload fails.
-            mkdir pkg_cache
-            sudo setfacl -R -m u:1000:rwx .
-            # 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 \
-            #(cd /tmp || exit ; curl -OLf https://github.com/felipecrs/docker-on-docker-shim/raw/refs/tags/v0.7.1/dond ; chmod +x /tmp/dond )
-            #/tmp/dond run \
-            docker run \
-              --rm \
-              --platform "${PLATFORM}" \
-              -e PUID=1000 \
-              -e PGID=1000 \
-              --privileged \
-              -e GCONV_PATH="/usr/local/lib${LIB_SUFFIX}/gconv" \
-              -e CREW_PRE_GLIBC_STANDALONE=1 \
-              -e CREW_REPO="${CREW_REPO}" \
-              -e CREW_BRANCH="${CREW_BRANCH}" \
-              -e GITLAB_TOKEN="${{ secrets.GITLAB_TOKEN }}" \
-              -e GITLAB_TOKEN_USERNAME="${{ secrets.GITLAB_TOKEN_USERNAME }}" \
-              -v "$(pwd)"/pkg_cache:/usr/local/tmp/packages:rshared \
-              -v "$(pwd)":/output:rshared \
-              --tmpfs /tmp \
-              "satmandu/crew-pre-glibc-standalone:${CONTAINER}" \
-              /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
-              echo "Deleting build output directories."
-              sudo rm -rf release pkg_cache
-      - name: Add updated packages to branch.
-        id: push-check
-        run: |
-          if [ -n "$(git status --porcelain)" ]; then
-            git config user.name "${{ github.actor }}"
-            git config user.email "${{ github.actor }}@users.noreply.github.com"
-            git add -A
-            git commit -m "Add built packages for ${PLATFORM} to ${{ env.BRANCH }}" && git push -f
-            git log --oneline -10
-          fi
-  build-check:
-    runs-on: ubuntu-24.04
-    needs:
-      - setup
-      - generate
-    if: ${{ !cancelled() }}
-    steps:
-      - name: fail if update or build jobs failed, otherwise create a PR
-        if: ${{ contains(needs.*.result, 'failure') }}
-        run: exit 1
-      - name: Report update & build success
-        run: echo "Update & build jobs succeeded. Creating a PR."
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          persist-credentials: true
-          ref: ${{ inputs.branch || github.ref_name }}
-      - name: Get all changed manifest files
-        id: changed-manifest-files
-        uses: tj-actions/changed-files@v45
-        with:
-          base_sha: master
-          files: manifest/**
-          since_last_remote_commit: true
-      - name: Rebase to master
-        run: |
-            git config user.name "${{ github.actor }}"
-            git config user.email "${{ github.actor }}@users.noreply.github.com"
-            git fetch origin
-            git checkout "${{ env.BRANCH }}"
-            git reset --hard "origin/${{ env.BRANCH }}"
-            git pull --rebase origin master && git push -f
-            git log --oneline -10
-      - name: Create Pull Request
-        if: ${{ github.event.inputs.with_pr == 'true' }}
-        env:
-          CHANGED_MANIFEST_FILES: ${{ steps.changed-manifest-files.outputs.all_changed_files }}
-          CHANGED_PACKAGES: ${{ needs.setup.outputs.changed_packages }}
-          TIMESTAMP: ${{ needs.setup.outputs.timestamp }}
-          i686_PACKAGES: ${{ needs.setup.outputs.i686_packages }}
-          x86_64_PACKAGES: ${{ needs.setup.outputs.x86_64_packages }}
-          armv7l_PACKAGES: ${{ needs.setup.outputs.armv7l_packages }}
-        run: |
-          rm -rf /tmp/pr.txt
-          echo -e "## Description" >> /tmp/pr.txt
-          echo -e "- This PR has built package updates using the Build.yml workflow, which was pointed to the ${{ env.BRANCH }} branch.\n" >> /tmp/pr.txt
-          echo -e "### Packages with Updated versions or Changed package files:" >> /tmp/pr.txt
-          for file in ${CHANGED_PACKAGES}
-            do
-            echo "- ${file}" >> /tmp/pr.txt
-          done
-          echo -e "##\nBuilds attempted for:" >> /tmp/pr.txt
-          [ -n "${x86_64_PACKAGES}" ] && echo -e "- [x] \`x86_64\`" >> /tmp/pr.txt
-          [ -n "${i686_PACKAGES}" ] && echo -e "- [x] \`i686\`" >> /tmp/pr.txt
-          [ -n "${armv7l_PACKAGES}" ] && echo -e "- [x] \`armv7l\`" >> /tmp/pr.txt
-          if [[ "${CHANGED_MANIFEST_FILES}" == "" ]]; then
-            echo -e "##\n- [x] This PR has no manifest .filelist changes. _(Package changes have neither added nor removed files.)_" >> /tmp/pr.txt
-          fi
-          echo -e "##\n### Run the following to get this pull request's changes locally for testing.\n\`\`\`bash" >> /tmp/pr.txt
-          echo -e "CREW_REPO=https://github.com/chromebrew/chromebrew.git CREW_BRANCH=${{ env.BRANCH }} crew update \\" >> /tmp/pr.txt
-          echo -e "&& yes | crew upgrade\n\`\`\`" >> /tmp/pr.txt
-          cat /tmp/pr.txt
-          PR_NUMBER=$(gh pr create --title "AutoBuild: ${{ env.BRANCH }} started at ${TIMESTAMP}" -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 & Add Reviewer Team
-        if: ${{ github.event.inputs.with_pr == 'true' }}
-        env:
-          GH_TOKEN: ${{ secrets.CREW_PR_TOKEN }}
-        run: |
-          echo "Flipping pr ${PR_NUMBER} state."
-          gh pr close "${PR_NUMBER}" && gh pr reopen "${PR_NUMBER}"
-          gh pr edit "${PR_NUMBER}" --add-reviewer chromebrew/active
-          gh pr merge "${PR_NUMBER}" --auto
--- a/.github/workflows/Updater.yml
+++ b/.github/workflows/Updater.yml
@@ -116,4 +116,4 @@ jobs:
      UPDATE_BRANCH_NAME: ${{ needs.update-check.outputs.update_branch_name }}
    steps:
      - name: gh_workflow_dispatch
-        run: gh workflow -R chromebrew/chromebrew run Updater-Build.yml -f branch="${UPDATE_BRANCH_NAME}"
+        run: gh workflow -R chromebrew/chromebrew run Build.yml -f branch="${UPDATE_BRANCH_NAME}"
--- a/manifest/armv7l/g/glib.filelist
+++ b/manifest/armv7l/g/glib.filelist
@@ -331,22 +331,22 @@
 /usr/local/lib/glib-2.0/include/glibconfig.h
 /usr/local/lib/libgio-2.0.so
 /usr/local/lib/libgio-2.0.so.0
-/usr/local/lib/libgio-2.0.so.0.8303.0
+/usr/local/lib/libgio-2.0.so.0.8500.0
 /usr/local/lib/libgirepository-2.0.so
 /usr/local/lib/libgirepository-2.0.so.0
-/usr/local/lib/libgirepository-2.0.so.0.8303.0
+/usr/local/lib/libgirepository-2.0.so.0.8500.0
 /usr/local/lib/libglib-2.0.so
 /usr/local/lib/libglib-2.0.so.0
-/usr/local/lib/libglib-2.0.so.0.8303.0
+/usr/local/lib/libglib-2.0.so.0.8500.0
 /usr/local/lib/libgmodule-2.0.so
 /usr/local/lib/libgmodule-2.0.so.0
-/usr/local/lib/libgmodule-2.0.so.0.8303.0
+/usr/local/lib/libgmodule-2.0.so.0.8500.0
 /usr/local/lib/libgobject-2.0.so
 /usr/local/lib/libgobject-2.0.so.0
-/usr/local/lib/libgobject-2.0.so.0.8303.0
+/usr/local/lib/libgobject-2.0.so.0.8500.0
 /usr/local/lib/libgthread-2.0.so
 /usr/local/lib/libgthread-2.0.so.0
-/usr/local/lib/libgthread-2.0.so.0.8303.0
+/usr/local/lib/libgthread-2.0.so.0.8500.0
 /usr/local/lib/pkgconfig/gio-2.0.pc
 /usr/local/lib/pkgconfig/gio-unix-2.0.pc
 /usr/local/lib/pkgconfig/girepository-2.0.pc
@@ -365,8 +365,8 @@
 /usr/local/share/bash-completion/completions/gio
 /usr/local/share/bash-completion/completions/gresource
 /usr/local/share/bash-completion/completions/gsettings
-/usr/local/share/gdb/auto-load/usr/local/lib/libglib-2.0.so.0.8303.0-gdb.py
-/usr/local/share/gdb/auto-load/usr/local/lib/libgobject-2.0.so.0.8303.0-gdb.py
+/usr/local/share/gdb/auto-load/usr/local/lib/libglib-2.0.so.0.8500.0-gdb.py
+/usr/local/share/gdb/auto-load/usr/local/lib/libgobject-2.0.so.0.8500.0-gdb.py
 /usr/local/share/gettext/its/gschema.its
 /usr/local/share/gettext/its/gschema.loc
 /usr/local/share/gir-1.0/GIRepository-3.0.gir
--- a/manifest/i686/g/glib.filelist
+++ b/manifest/i686/g/glib.filelist
@@ -324,22 +324,22 @@
 /usr/local/lib/glib-2.0/include/glibconfig.h
 /usr/local/lib/libgio-2.0.so
 /usr/local/lib/libgio-2.0.so.0
-/usr/local/lib/libgio-2.0.so.0.8303.0
+/usr/local/lib/libgio-2.0.so.0.8500.0
 /usr/local/lib/libgirepository-2.0.so
 /usr/local/lib/libgirepository-2.0.so.0
-/usr/local/lib/libgirepository-2.0.so.0.8303.0
+/usr/local/lib/libgirepository-2.0.so.0.8500.0
 /usr/local/lib/libglib-2.0.so
 /usr/local/lib/libglib-2.0.so.0
-/usr/local/lib/libglib-2.0.so.0.8303.0
+/usr/local/lib/libglib-2.0.so.0.8500.0
 /usr/local/lib/libgmodule-2.0.so
 /usr/local/lib/libgmodule-2.0.so.0
-/usr/local/lib/libgmodule-2.0.so.0.8303.0
+/usr/local/lib/libgmodule-2.0.so.0.8500.0
 /usr/local/lib/libgobject-2.0.so
 /usr/local/lib/libgobject-2.0.so.0
-/usr/local/lib/libgobject-2.0.so.0.8303.0
+/usr/local/lib/libgobject-2.0.so.0.8500.0
 /usr/local/lib/libgthread-2.0.so
 /usr/local/lib/libgthread-2.0.so.0
-/usr/local/lib/libgthread-2.0.so.0.8303.0
+/usr/local/lib/libgthread-2.0.so.0.8500.0
 /usr/local/lib/pkgconfig/gio-2.0.pc
 /usr/local/lib/pkgconfig/gio-unix-2.0.pc
 /usr/local/lib/pkgconfig/girepository-2.0.pc
@@ -358,8 +358,8 @@
 /usr/local/share/bash-completion/completions/gio
 /usr/local/share/bash-completion/completions/gresource
 /usr/local/share/bash-completion/completions/gsettings
-/usr/local/share/gdb/auto-load/usr/local/lib/libglib-2.0.so.0.8303.0-gdb.py
-/usr/local/share/gdb/auto-load/usr/local/lib/libgobject-2.0.so.0.8303.0-gdb.py
+/usr/local/share/gdb/auto-load/usr/local/lib/libglib-2.0.so.0.8500.0-gdb.py
+/usr/local/share/gdb/auto-load/usr/local/lib/libgobject-2.0.so.0.8500.0-gdb.py
 /usr/local/share/gettext/its/gschema.its
 /usr/local/share/gettext/its/gschema.loc
 /usr/local/share/glib-2.0/codegen/__init__.py
--- a/manifest/x86_64/g/glib.filelist
+++ b/manifest/x86_64/g/glib.filelist
@@ -331,22 +331,22 @@
 /usr/local/lib64/glib-2.0/include/glibconfig.h
 /usr/local/lib64/libgio-2.0.so
 /usr/local/lib64/libgio-2.0.so.0
-/usr/local/lib64/libgio-2.0.so.0.8303.0
+/usr/local/lib64/libgio-2.0.so.0.8500.0
 /usr/local/lib64/libgirepository-2.0.so
 /usr/local/lib64/libgirepository-2.0.so.0
-/usr/local/lib64/libgirepository-2.0.so.0.8303.0
+/usr/local/lib64/libgirepository-2.0.so.0.8500.0
 /usr/local/lib64/libglib-2.0.so
 /usr/local/lib64/libglib-2.0.so.0
-/usr/local/lib64/libglib-2.0.so.0.8303.0
+/usr/local/lib64/libglib-2.0.so.0.8500.0
 /usr/local/lib64/libgmodule-2.0.so
 /usr/local/lib64/libgmodule-2.0.so.0
-/usr/local/lib64/libgmodule-2.0.so.0.8303.0
+/usr/local/lib64/libgmodule-2.0.so.0.8500.0
 /usr/local/lib64/libgobject-2.0.so
 /usr/local/lib64/libgobject-2.0.so.0
-/usr/local/lib64/libgobject-2.0.so.0.8303.0
+/usr/local/lib64/libgobject-2.0.so.0.8500.0
 /usr/local/lib64/libgthread-2.0.so
 /usr/local/lib64/libgthread-2.0.so.0
-/usr/local/lib64/libgthread-2.0.so.0.8303.0
+/usr/local/lib64/libgthread-2.0.so.0.8500.0
 /usr/local/lib64/pkgconfig/gio-2.0.pc
 /usr/local/lib64/pkgconfig/gio-unix-2.0.pc
 /usr/local/lib64/pkgconfig/girepository-2.0.pc
@@ -365,8 +365,8 @@
 /usr/local/share/bash-completion/completions/gio
 /usr/local/share/bash-completion/completions/gresource
 /usr/local/share/bash-completion/completions/gsettings
-/usr/local/share/gdb/auto-load/usr/local/lib64/libglib-2.0.so.0.8303.0-gdb.py
-/usr/local/share/gdb/auto-load/usr/local/lib64/libgobject-2.0.so.0.8303.0-gdb.py
+/usr/local/share/gdb/auto-load/usr/local/lib64/libglib-2.0.so.0.8500.0-gdb.py
+/usr/local/share/gdb/auto-load/usr/local/lib64/libgobject-2.0.so.0.8500.0-gdb.py
 /usr/local/share/gettext/its/gschema.its
 /usr/local/share/gettext/its/gschema.loc
 /usr/local/share/gir-1.0/GIRepository-3.0.gir
--- a/packages/glib.rb
+++ b/packages/glib.rb
@@ -3,7 +3,7 @@ require 'buildsystems/meson'
 class Glib < Meson
  description 'GLib provides the core application building blocks for libraries and applications written in C.'
  homepage 'https://docs.gtk.org/glib/'
-  version '2.83.3'
+  version '2.85.0'
  license 'LGPL-2.1'
  compatibility 'all'
  source_url 'https://gitlab.gnome.org/GNOME/glib.git'
@@ -11,15 +11,15 @@ class Glib < Meson
  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: 'db3148e9fe0cbdcdf5b979c2a18c560308db615454ee9997e12e906d6b6313c8',
-     armv7l: 'db3148e9fe0cbdcdf5b979c2a18c560308db615454ee9997e12e906d6b6313c8',
-       i686: '4f6e9b0d317e2750b8e5fc317ccdf79b1fe17688f33f1b0cf89c2514e42e6b0c',
-     x86_64: '59356454a19aa10e23544575b38e112d9e5669452f9edd4098762ae9f813c7c2'
+    aarch64: '44772d6737d8ed76fcdbbdffd13cc86b6a3054bbc29c90b075365f07001c770f',
+     armv7l: '44772d6737d8ed76fcdbbdffd13cc86b6a3054bbc29c90b075365f07001c770f',
+       i686: 'bb44cd8cda14a0831bd8fc3c24600aa8cacf7e87cb65722be1717559af314d3c',
+     x86_64: '82b603c28ece519fdd9bb1c2b895be54ddbed4ca872870f6d6c13cff51d5cc62'
  })

  depends_on 'elfutils' # R
  depends_on 'gcc_lib' # R
-  depends_on 'gobject_introspection' unless ARCH == 'i686' # L
+  # depends_on 'gobject_introspection' unless ARCH == 'i686' # L
  depends_on 'libffi' # R
  depends_on 'pcre2' # R
  depends_on 'py3_pygments' => :build
--- a/packages/gobject_introspection.rb
+++ b/packages/gobject_introspection.rb
@@ -3,7 +3,7 @@ require 'buildsystems/meson'
 class Gobject_introspection < Meson
  description 'GObject introspection is a middleware layer between C libraries (using GObject) and language bindings.'
  homepage 'https://wiki.gnome.org/action/show/Projects/GObjectIntrospection'
-  version "1.81.4-#{CREW_PY_VER}"
+  version "1.84.0-#{CREW_PY_VER}"
  license 'LGPL-2+ and GPL-2+'
  compatibility 'aarch64 armv7l x86_64'
  source_url 'https://gitlab.gnome.org/GNOME/gobject-introspection.git'
@@ -11,9 +11,9 @@ class Gobject_introspection < Meson
  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: '160e81f4e83e853bfcd5a16394eaa2b458c6cf1cca65d958f7eea4c8c95a806d',
-     armv7l: '160e81f4e83e853bfcd5a16394eaa2b458c6cf1cca65d958f7eea4c8c95a806d',
-     x86_64: '8529db83792eb3dd859fd3a20fe2a700d628e34d3954db629d7dc9ce508df85b'
+    aarch64: 'b328f3748aa5a2aa976436312b5e5959d1ea6c35d11e48d1f4040b345007928a',
+     armv7l: 'b328f3748aa5a2aa976436312b5e5959d1ea6c35d11e48d1f4040b345007928a',
+     x86_64: '68aa2b5c1ff919bbef371869d72373bf828ff5e190b6b038bbed1b4bc3abcd45'
  })

  depends_on 'gcc_lib' # R