From 715cc6d87dbfde87cda8a5652860727876fa31b7 Mon Sep 17 00:00:00 2001 From: "chromebrew-actions[bot]" <220035932+chromebrew-actions[bot]@users.noreply.github.com> Date: Thu, 20 Nov 2025 17:14:04 -0600 Subject: [PATCH] =?UTF-8?q?git=20=E2=86=92=202.52.0=20(#13537)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add unbuilt git to updater-git-2.52.0 * Adjust linker Signed-off-by: Satadru Pramanik * Add llvm_dev dep to bring in lld. Signed-off-by: Satadru Pramanik * Let CC_LD and CXX_LD use CREW_LINKER. Signed-off-by: Satadru Pramanik * Use no_mold for armv7l. Signed-off-by: Satadru Pramanik * Update workflows to cleanup diskspace in GitHub actions and adjust gh token usage. Signed-off-by: Satadru Pramanik * Build git for arm without rust. Signed-off-by: Satadru Pramanik * updater-git-2.52.0: Package File Update Run on linux/386 container. * updater-git-2.52.0: Package File Update Run on linux/amd64 container. * lint Signed-off-by: Satadru Pramanik * bump version Signed-off-by: Satadru Pramanik --------- Signed-off-by: Satadru Pramanik Co-authored-by: satmandu Co-authored-by: Satadru Pramanik --- .github/workflows/Build.yml | 22 +++++++++++++++++--- .github/workflows/Generate-PR.yml | 34 +++++++++++++++++++++++-------- .github/workflows/Unit-Test.yml | 16 +++++++++++++++ lib/const.rb | 2 +- lib/package.rb | 12 +++++++++-- manifest/armv7l/g/git.filelist | 5 ++++- manifest/i686/g/git.filelist | 5 ++++- manifest/x86_64/g/git.filelist | 5 ++++- packages/git.rb | 13 ++++++------ 9 files changed, 90 insertions(+), 24 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index add93d6c8..c53db9b25 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -226,9 +226,6 @@ jobs: concurrency: group: ${{ matrix.arch }}-${{ github.workflow }}-${{ inputs.branch || github.ref_name }} steps: - - name: Build Container cleanup - run: | - sudo rm -rf release - name: Dump GitHub context env: GITHUB_CONTEXT: ${{ toJson(github) }} @@ -253,6 +250,25 @@ jobs: env: MATRIX_CONTEXT: ${{ toJson(matrix) }} run: echo "$MATRIX_CONTEXT" + - name: Free Disk Space (Ubuntu) + uses: BRAINSia/free-disk-space@v2 + with: + # this might remove tools that are actually needed, + # if set to "true" but frees about 6 GB + tool-cache: false + + # all of these default to true, but feel free to set to + # "false" if necessary for your workflow + mandb: true + android: true + dotnet: true + haskell: true + large-packages: true + docker-images: true + swap-storage: true + - name: Build Container cleanup + run: | + sudo rm -rf release - uses: actions/checkout@v5 with: fetch-depth: 0 diff --git a/.github/workflows/Generate-PR.yml b/.github/workflows/Generate-PR.yml index 03138f440..17d934d83 100644 --- a/.github/workflows/Generate-PR.yml +++ b/.github/workflows/Generate-PR.yml @@ -238,6 +238,22 @@ jobs: env: MATRIX_CONTEXT: ${{ toJson(matrix) }} run: echo "$MATRIX_CONTEXT" + - name: Free Disk Space (Ubuntu) + uses: BRAINSia/free-disk-space@v2 + with: + # this might remove tools that are actually needed, + # if set to "true" but frees about 6 GB + tool-cache: false + + # all of these default to true, but feel free to set to + # "false" if necessary for your workflow + mandb: true + android: true + dotnet: true + haskell: true + large-packages: true + docker-images: true + swap-storage: true - uses: actions/checkout@v5 with: fetch-depth: 0 @@ -394,10 +410,18 @@ jobs: make -j "$(nproc)" sudo make install sudo gem install --no-update-sources -N ruby-libversion --conservative + - name: Get GH Token + id: get_workflow_token + uses: peter-murray/workflow-application-token-action@v4 + with: + application_id: ${{ secrets.APPLICATION_ID }} + application_private_key: ${{ secrets.APPLICATION_PRIVATE_KEY }} + organization: chromebrew + revoke_token: true - name: Save git log id: save-git-log env: - GH_TOKEN: ${{ secrets.CREW_PR_TOKEN }} + GH_TOKEN: ${{ steps.get_workflow_token.outputs.token }} run: | PR_NUMBER=$(gh pr list -L 1 -s open -H ${{ inputs.branch || github.ref_name }} | cut -f1) if [[ -n ${PR_NUMBER} ]]; then @@ -433,14 +457,6 @@ jobs: - '!manifest/**' - '!packages/*.rb' - '!.github/**' - - name: Get GH Token - id: get_workflow_token - uses: peter-murray/workflow-application-token-action@v4 - with: - application_id: ${{ secrets.APPLICATION_ID }} - application_private_key: ${{ secrets.APPLICATION_PRIVATE_KEY }} - organization: chromebrew - revoke_token: true - name: Create Pull Request env: CHANGED_GITHUB_CONFIG_FILES: ${{ steps.changed-files.outputs.github_all_changed_files }} diff --git a/.github/workflows/Unit-Test.yml b/.github/workflows/Unit-Test.yml index 48e1595cf..19a3a5dbd 100644 --- a/.github/workflows/Unit-Test.yml +++ b/.github/workflows/Unit-Test.yml @@ -37,6 +37,22 @@ jobs: group: ${{ matrix.arch }}-${{ github.workflow }}-${{ github.ref }}-${{ github.sha }} cancel-in-progress: true steps: + - name: Free Disk Space (Ubuntu) + uses: BRAINSia/free-disk-space@v2 + with: + # this might remove tools that are actually needed, + # if set to "true" but frees about 6 GB + tool-cache: false + + # all of these default to true, but feel free to set to + # "false" if necessary for your workflow + mandb: true + android: true + dotnet: true + haskell: true + large-packages: true + docker-images: true + swap-storage: true - uses: actions/checkout@v5 with: persist-credentials: true diff --git a/lib/const.rb b/lib/const.rb index 255ec95a5..07690e7fd 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -4,7 +4,7 @@ require 'etc' require 'open3' OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0' -CREW_VERSION ||= '1.68.0' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION +CREW_VERSION ||= '1.68.1' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION # Kernel architecture. KERN_ARCH ||= Etc.uname[:machine] diff --git a/lib/package.rb b/lib/package.rb index a25f4d55e..25de0f7f9 100644 --- a/lib/package.rb +++ b/lib/package.rb @@ -402,8 +402,16 @@ class Package env['CREW_PRELOAD_ENABLE_COMPILE_HACKS'] = opt_args.delete(:no_preload_hacks) ? '0' : '1' # CC_LD and CXX_LD are needed by meson to override mold being # detected and used by default. - env['CC_LD'] = @no_mold ? 'bfd' : 'mold' - env['CXX_LD'] = @no_mold ? 'bfd' : 'mold' + env['CC_LD'] = if @no_mold + CREW_LINKER == 'mold' ? 'bfd' : CREW_LINKER + else + CREW_LINKER + end + env['CXX_LD'] = if @no_mold + CREW_LINKER == 'mold' ? 'bfd' : CREW_LINKER + else + CREW_LINKER + end env['CREW_PRELOAD_NO_MOLD'] = @no_mold ? '1' : '0' env['LD_PRELOAD'] = File.join(CREW_LIB_PREFIX, 'crew-preload.so') if File.exist?("#{CREW_LIB_PREFIX}/crew-preload.so") diff --git a/manifest/armv7l/g/git.filelist b/manifest/armv7l/g/git.filelist index 821c87a85..cc4a32975 100644 --- a/manifest/armv7l/g/git.filelist +++ b/manifest/armv7l/g/git.filelist @@ -1,4 +1,4 @@ -# Total size: 25352727 +# Total size: 25709655 /usr/local/bin/git /usr/local/bin/git-cvsserver /usr/local/bin/git-receive-pack @@ -186,6 +186,7 @@ /usr/local/share/man/man1/git-init.1.zst /usr/local/share/man/man1/git-instaweb.1.zst /usr/local/share/man/man1/git-interpret-trailers.1.zst +/usr/local/share/man/man1/git-last-modified.1.zst /usr/local/share/man/man1/git-log.1.zst /usr/local/share/man/man1/git-ls-files.1.zst /usr/local/share/man/man1/git-ls-remote.1.zst @@ -229,6 +230,7 @@ /usr/local/share/man/man1/git-repack.1.zst /usr/local/share/man/man1/git-replace.1.zst /usr/local/share/man/man1/git-replay.1.zst +/usr/local/share/man/man1/git-repo.1.zst /usr/local/share/man/man1/git-request-pull.1.zst /usr/local/share/man/man1/git-rerere.1.zst /usr/local/share/man/man1/git-reset.1.zst @@ -283,6 +285,7 @@ /usr/local/share/man/man5/gitformat-chunk.5.zst /usr/local/share/man/man5/gitformat-commit-graph.5.zst /usr/local/share/man/man5/gitformat-index.5.zst +/usr/local/share/man/man5/gitformat-loose.5.zst /usr/local/share/man/man5/gitformat-pack.5.zst /usr/local/share/man/man5/gitformat-signature.5.zst /usr/local/share/man/man5/githooks.5.zst diff --git a/manifest/i686/g/git.filelist b/manifest/i686/g/git.filelist index 1c46d13e9..58b69b806 100644 --- a/manifest/i686/g/git.filelist +++ b/manifest/i686/g/git.filelist @@ -1,4 +1,4 @@ -# Total size: 31397275 +# Total size: 31795080 /usr/local/bin/git /usr/local/bin/git-cvsserver /usr/local/bin/git-receive-pack @@ -186,6 +186,7 @@ /usr/local/share/man/man1/git-init.1.zst /usr/local/share/man/man1/git-instaweb.1.zst /usr/local/share/man/man1/git-interpret-trailers.1.zst +/usr/local/share/man/man1/git-last-modified.1.zst /usr/local/share/man/man1/git-log.1.zst /usr/local/share/man/man1/git-ls-files.1.zst /usr/local/share/man/man1/git-ls-remote.1.zst @@ -229,6 +230,7 @@ /usr/local/share/man/man1/git-repack.1.zst /usr/local/share/man/man1/git-replace.1.zst /usr/local/share/man/man1/git-replay.1.zst +/usr/local/share/man/man1/git-repo.1.zst /usr/local/share/man/man1/git-request-pull.1.zst /usr/local/share/man/man1/git-rerere.1.zst /usr/local/share/man/man1/git-reset.1.zst @@ -283,6 +285,7 @@ /usr/local/share/man/man5/gitformat-chunk.5.zst /usr/local/share/man/man5/gitformat-commit-graph.5.zst /usr/local/share/man/man5/gitformat-index.5.zst +/usr/local/share/man/man5/gitformat-loose.5.zst /usr/local/share/man/man5/gitformat-pack.5.zst /usr/local/share/man/man5/gitformat-signature.5.zst /usr/local/share/man/man5/githooks.5.zst diff --git a/manifest/x86_64/g/git.filelist b/manifest/x86_64/g/git.filelist index e6d9145f6..4b4075a2b 100644 --- a/manifest/x86_64/g/git.filelist +++ b/manifest/x86_64/g/git.filelist @@ -1,4 +1,4 @@ -# Total size: 29719075 +# Total size: 30120156 /usr/local/bin/git /usr/local/bin/git-cvsserver /usr/local/bin/git-receive-pack @@ -186,6 +186,7 @@ /usr/local/share/man/man1/git-init.1.zst /usr/local/share/man/man1/git-instaweb.1.zst /usr/local/share/man/man1/git-interpret-trailers.1.zst +/usr/local/share/man/man1/git-last-modified.1.zst /usr/local/share/man/man1/git-log.1.zst /usr/local/share/man/man1/git-ls-files.1.zst /usr/local/share/man/man1/git-ls-remote.1.zst @@ -229,6 +230,7 @@ /usr/local/share/man/man1/git-repack.1.zst /usr/local/share/man/man1/git-replace.1.zst /usr/local/share/man/man1/git-replay.1.zst +/usr/local/share/man/man1/git-repo.1.zst /usr/local/share/man/man1/git-request-pull.1.zst /usr/local/share/man/man1/git-rerere.1.zst /usr/local/share/man/man1/git-reset.1.zst @@ -283,6 +285,7 @@ /usr/local/share/man/man5/gitformat-chunk.5.zst /usr/local/share/man/man5/gitformat-commit-graph.5.zst /usr/local/share/man/man5/gitformat-index.5.zst +/usr/local/share/man/man5/gitformat-loose.5.zst /usr/local/share/man/man5/gitformat-pack.5.zst /usr/local/share/man/man5/gitformat-signature.5.zst /usr/local/share/man/man5/githooks.5.zst diff --git a/packages/git.rb b/packages/git.rb index af380a1da..ccac5206e 100644 --- a/packages/git.rb +++ b/packages/git.rb @@ -3,18 +3,18 @@ require 'buildsystems/meson' class Git < Meson description 'Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.' homepage 'https://git-scm.com/' - version '2.51.2' + version '2.52.0' license 'GPL-2' compatibility 'all' source_url "https://mirrors.edge.kernel.org/pub/software/scm/git/git-#{version.split('-').first}.tar.xz" - source_sha256 '233d7143a2d58e60755eee9b76f559ec73ea2b3c297f5b503162ace95966b4e3' + source_sha256 '3cd8fee86f69a949cb610fee8cd9264e6873d07fa58411f6060b3d62729ed7c5' binary_compression 'tar.zst' binary_sha256({ - aarch64: '869fbe2b5493ec1a8291a61663e1ba0f90122f470f9956a659ef2289139c4af2', - armv7l: '869fbe2b5493ec1a8291a61663e1ba0f90122f470f9956a659ef2289139c4af2', - i686: 'c7b6140ed7c89f866d88867ef0c55ac8f1a1f04c559fe19e488785c5b3d3ae70', - x86_64: 'c5c556bdd7a6452392b4d8c71215b7ee48baf1d46f5069a7b48bf8b3988a5612' + aarch64: '814d8f63987d20480ae79f8c0c7f8d2918f10e2252ac51a4b78de2adc7dcc0d8', + armv7l: '814d8f63987d20480ae79f8c0c7f8d2918f10e2252ac51a4b78de2adc7dcc0d8', + i686: '290d425d864e44f5f8570dbeb45d5d142fe1f5d3673ffee179db00339278824e', + x86_64: 'b0ebde721c958690991dec72abec51cb2d8caec1013318448824aaaa38c7022f' }) depends_on 'ca_certificates' => :build @@ -36,6 +36,7 @@ class Git < Meson -Dgitattributes=#{CREW_PREFIX}/etc/gitattributes \ -Dgitconfig=#{CREW_PREFIX}/etc/gitconfig \ -Dgitweb=disabled \ + #{'-Drust=disabled' if ARCH == 'armv7l'} \ -Dsane_tool_path=#{CREW_PREFIX}/bin \ -Dzlib_backend=zlib-ng"