From 89acd8068a553ae45539e86955aeb4a4fc5090af Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 22 Jan 2025 15:07:28 +0100 Subject: [PATCH] fixup! DEBUG: only run `osx-reftable` --- .github/workflows/check-style.yml | 34 ----- .github/workflows/check-whitespace.yml | 32 ----- .github/workflows/coverity.yml | 163 ----------------------- .github/workflows/l10n.yml | 111 --------------- .github/workflows/monitor-components.yml | 98 -------------- .github/workflows/nano-server.yml | 76 ----------- 6 files changed, 514 deletions(-) delete mode 100644 .github/workflows/check-style.yml delete mode 100644 .github/workflows/check-whitespace.yml delete mode 100644 .github/workflows/coverity.yml delete mode 100644 .github/workflows/l10n.yml delete mode 100644 .github/workflows/monitor-components.yml delete mode 100644 .github/workflows/nano-server.yml diff --git a/.github/workflows/check-style.yml b/.github/workflows/check-style.yml deleted file mode 100644 index c052a5df2381e9..00000000000000 --- a/.github/workflows/check-style.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: check-style - -# Get the repository with all commits to ensure that we can analyze -# all of the commits contributed via the Pull Request. - -on: - pull_request: - types: [opened, synchronize] - -# Avoid unnecessary builds. Unlike the main CI jobs, these are not -# ci-configurable (but could be). -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - check-style: - env: - CC: clang - jobname: ClangFormat - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - run: ci/install-dependencies.sh - - - name: git clang-format - continue-on-error: true - id: check_out - run: | - ./ci/run-style-check.sh \ - "${{github.event.pull_request.base.sha}}" diff --git a/.github/workflows/check-whitespace.yml b/.github/workflows/check-whitespace.yml deleted file mode 100644 index d0a78fc426f9e4..00000000000000 --- a/.github/workflows/check-whitespace.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: check-whitespace - -# Get the repository with all commits to ensure that we can analyze -# all of the commits contributed via the Pull Request. -# Process `git log --check` output to extract just the check errors. -# Exit with failure upon white-space issues. - -on: - pull_request: - types: [opened, synchronize] - -# Avoid unnecessary builds. Unlike the main CI jobs, these are not -# ci-configurable (but could be). -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - check-whitespace: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: git log --check - id: check_out - run: | - ./ci/check-whitespace.sh \ - "${{github.event.pull_request.base.sha}}" \ - "$GITHUB_STEP_SUMMARY" \ - "https://github.com/${{github.repository}}" diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml deleted file mode 100644 index 48341e81f49066..00000000000000 --- a/.github/workflows/coverity.yml +++ /dev/null @@ -1,163 +0,0 @@ -name: Coverity - -# This GitHub workflow automates submitting builds to Coverity Scan. To enable it, -# set the repository variable `ENABLE_COVERITY_SCAN_FOR_BRANCHES` (for details, see -# https://docs.github.com/en/actions/learn-github-actions/variables) to a JSON -# string array containing the names of the branches for which the workflow should be -# run, e.g. `["main", "next"]`. -# -# In addition, two repository secrets must be set (for details how to add secrets, see -# https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions): -# `COVERITY_SCAN_EMAIL` and `COVERITY_SCAN_TOKEN`. The former specifies the -# email to which the Coverity reports should be sent and the latter can be -# obtained from the Project Settings tab of the Coverity project). -# -# The workflow runs on `ubuntu-latest` by default. This can be overridden by setting -# the repository variable `ENABLE_COVERITY_SCAN_ON_OS` to a JSON string array specifying -# the operating systems, e.g. `["ubuntu-latest", "windows-latest"]`. -# -# By default, the builds are submitted to the Coverity project `git`. To override this, -# set the repository variable `COVERITY_PROJECT`. - -on: - push: - -defaults: - run: - shell: bash - -jobs: - coverity: - if: contains(fromJSON(vars.ENABLE_COVERITY_SCAN_FOR_BRANCHES || '[""]'), github.ref_name) - strategy: - matrix: - os: ${{ fromJSON(vars.ENABLE_COVERITY_SCAN_ON_OS || '["ubuntu-latest"]') }} - runs-on: ${{ matrix.os }} - env: - COVERITY_PROJECT: ${{ vars.COVERITY_PROJECT || 'git' }} - COVERITY_LANGUAGE: cxx - COVERITY_PLATFORM: overridden-below - steps: - - uses: actions/checkout@v4 - - name: install minimal Git for Windows SDK - if: contains(matrix.os, 'windows') - uses: git-for-windows/setup-git-for-windows-sdk@v1 - - run: ci/install-dependencies.sh - if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos') - env: - distro: ${{ matrix.os }} - - # The Coverity site says the tool is usually updated twice yearly, so the - # MD5 of download can be used to determine whether there's been an update. - - name: get the Coverity Build Tool hash - id: lookup - run: | - case "${{ matrix.os }}" in - *windows*) - COVERITY_PLATFORM=win64 - COVERITY_TOOL_FILENAME=cov-analysis.zip - MAKEFLAGS=-j$(nproc) - ;; - *macos*) - COVERITY_PLATFORM=macOSX - COVERITY_TOOL_FILENAME=cov-analysis.dmg - MAKEFLAGS=-j$(sysctl -n hw.physicalcpu) - ;; - *ubuntu*) - COVERITY_PLATFORM=linux64 - COVERITY_TOOL_FILENAME=cov-analysis.tgz - MAKEFLAGS=-j$(nproc) - ;; - *) - echo '::error::unhandled OS ${{ matrix.os }}' >&2 - exit 1 - ;; - esac - echo "COVERITY_PLATFORM=$COVERITY_PLATFORM" >>$GITHUB_ENV - echo "COVERITY_TOOL_FILENAME=$COVERITY_TOOL_FILENAME" >>$GITHUB_ENV - echo "MAKEFLAGS=$MAKEFLAGS" >>$GITHUB_ENV - MD5=$(curl https://scan.coverity.com/download/$COVERITY_LANGUAGE/$COVERITY_PLATFORM \ - --fail \ - --form token='${{ secrets.COVERITY_SCAN_TOKEN }}' \ - --form project="$COVERITY_PROJECT" \ - --form md5=1) - case $? in - 0) ;; # okay - 22) # 40x, i.e. access denied - echo "::error::incorrect token or project?" >&2 - exit 1 - ;; - *) # other error - echo "::error::Failed to retrieve MD5" >&2 - exit 1 - ;; - esac - echo "hash=$MD5" >>$GITHUB_OUTPUT - - # Try to cache the tool to avoid downloading 1GB+ on every run. - # A cache miss will add ~30s to create, but a cache hit will save minutes. - - name: restore the Coverity Build Tool - id: cache - uses: actions/cache/restore@v4 - with: - path: ${{ runner.temp }}/cov-analysis - key: cov-build-${{ env.COVERITY_LANGUAGE }}-${{ env.COVERITY_PLATFORM }}-${{ steps.lookup.outputs.hash }} - - name: download the Coverity Build Tool (${{ env.COVERITY_LANGUAGE }} / ${{ env.COVERITY_PLATFORM}}) - if: steps.cache.outputs.cache-hit != 'true' - run: | - curl https://scan.coverity.com/download/$COVERITY_LANGUAGE/$COVERITY_PLATFORM \ - --fail --no-progress-meter \ - --output $RUNNER_TEMP/$COVERITY_TOOL_FILENAME \ - --form token='${{ secrets.COVERITY_SCAN_TOKEN }}' \ - --form project="$COVERITY_PROJECT" - - name: extract the Coverity Build Tool - if: steps.cache.outputs.cache-hit != 'true' - run: | - case "$COVERITY_TOOL_FILENAME" in - *.tgz) - mkdir $RUNNER_TEMP/cov-analysis && - tar -xzf $RUNNER_TEMP/$COVERITY_TOOL_FILENAME --strip 1 -C $RUNNER_TEMP/cov-analysis - ;; - *.dmg) - cd $RUNNER_TEMP && - attach="$(hdiutil attach $COVERITY_TOOL_FILENAME)" && - volume="$(echo "$attach" | cut -f 3 | grep /Volumes/)" && - mkdir cov-analysis && - cd cov-analysis && - sh "$volume"/cov-analysis-macosx-*.sh && - ls -l && - hdiutil detach "$volume" - ;; - *.zip) - cd $RUNNER_TEMP && - mkdir cov-analysis-tmp && - unzip -d cov-analysis-tmp $COVERITY_TOOL_FILENAME && - mv cov-analysis-tmp/* cov-analysis - ;; - *) - echo "::error::unhandled archive type: $COVERITY_TOOL_FILENAME" >&2 - exit 1 - ;; - esac - - name: cache the Coverity Build Tool - if: steps.cache.outputs.cache-hit != 'true' - uses: actions/cache/save@v4 - with: - path: ${{ runner.temp }}/cov-analysis - key: cov-build-${{ env.COVERITY_LANGUAGE }}-${{ env.COVERITY_PLATFORM }}-${{ steps.lookup.outputs.hash }} - - name: build with cov-build - run: | - export PATH="$RUNNER_TEMP/cov-analysis/bin:$PATH" && - cov-configure --gcc && - cov-build --dir cov-int make - - name: package the build - run: tar -czvf cov-int.tgz cov-int - - name: submit the build to Coverity Scan - run: | - curl \ - --fail \ - --form token='${{ secrets.COVERITY_SCAN_TOKEN }}' \ - --form email='${{ secrets.COVERITY_SCAN_EMAIL }}' \ - --form file=@cov-int.tgz \ - --form version='${{ github.sha }}' \ - "https://scan.coverity.com/builds?project=$COVERITY_PROJECT" diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml deleted file mode 100644 index e2c3dbdcb50f0c..00000000000000 --- a/.github/workflows/l10n.yml +++ /dev/null @@ -1,111 +0,0 @@ -name: git-l10n - -on: [push, pull_request_target] - -# Avoid unnecessary builds. Unlike the main CI jobs, these are not -# ci-configurable (but could be). -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - git-po-helper: - if: >- - endsWith(github.repository, '/git-po') || - contains(github.head_ref, 'l10n') || - contains(github.ref, 'l10n') - runs-on: ubuntu-latest - permissions: - pull-requests: write - steps: - - name: Setup base and head objects - id: setup-tips - run: | - if test "${{ github.event_name }}" = "pull_request_target" - then - base=${{ github.event.pull_request.base.sha }} - head=${{ github.event.pull_request.head.sha }} - else - base=${{ github.event.before }} - head=${{ github.event.after }} - fi - echo base=$base >>$GITHUB_OUTPUT - echo head=$head >>$GITHUB_OUTPUT - - name: Run partial clone - run: | - git -c init.defaultBranch=master init --bare . - git remote add \ - --mirror=fetch \ - origin \ - https://github.com/${{ github.repository }} - # Fetch tips that may be unreachable from github.ref: - # - For a forced push, "$base" may be unreachable. - # - For a "pull_request_target" event, "$head" may be unreachable. - args= - for commit in \ - ${{ steps.setup-tips.outputs.base }} \ - ${{ steps.setup-tips.outputs.head }} - do - case $commit in - *[^0]*) - args="$args $commit" - ;; - *) - # Should not fetch ZERO-OID. - ;; - esac - done - git -c protocol.version=2 fetch \ - --progress \ - --no-tags \ - --no-write-fetch-head \ - --filter=blob:none \ - origin \ - ${{ github.ref }} \ - $args - - uses: actions/setup-go@v5 - with: - go-version: '>=1.16' - cache: false - - name: Install git-po-helper - run: go install github.com/git-l10n/git-po-helper@main - - name: Install other dependencies - run: | - sudo apt-get update -q && - sudo apt-get install -q -y gettext - - name: Run git-po-helper - id: check-commits - run: | - exit_code=0 - git-po-helper check-commits \ - --github-action-event="${{ github.event_name }}" -- \ - ${{ steps.setup-tips.outputs.base }}..${{ steps.setup-tips.outputs.head }} \ - >git-po-helper.out 2>&1 || exit_code=$? - if test $exit_code -ne 0 || grep -q WARNING git-po-helper.out - then - # Remove ANSI colors which are proper for console logs but not - # proper for PR comment. - echo "COMMENT_BODY<>$GITHUB_ENV - perl -pe 's/\e\[[0-9;]*m//g; s/\bEOF$//g' git-po-helper.out >>$GITHUB_ENV - echo "EOF" >>$GITHUB_ENV - fi - cat git-po-helper.out - exit $exit_code - - name: Create comment in pull request for report - uses: mshick/add-pr-comment@v2 - if: >- - always() && - github.event_name == 'pull_request_target' && - env.COMMENT_BODY != '' - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - message: > - ${{ steps.check-commits.outcome == 'failure' && 'Errors and warnings' || 'Warnings' }} - found by [git-po-helper](https://github.com/git-l10n/git-po-helper#readme) in workflow - [#${{ github.run_number }}](${{ env.GITHUB_SERVER_URL }}/${{ github.repository }}/actions/runs/${{ github.run_id }}): - - ``` - - ${{ env.COMMENT_BODY }} - - ``` diff --git a/.github/workflows/monitor-components.yml b/.github/workflows/monitor-components.yml deleted file mode 100644 index fedc6add69a9e0..00000000000000 --- a/.github/workflows/monitor-components.yml +++ /dev/null @@ -1,98 +0,0 @@ -name: Monitor component updates - -# Git for Windows is a slightly modified subset of MSYS2. Some of its -# components are maintained by Git for Windows, others by MSYS2. To help -# keeping the former up to date, this workflow monitors the Atom/RSS feeds -# and opens new tickets for each new component version. - -on: - schedule: - - cron: "23 8,11,14,17 * * *" - workflow_dispatch: - -env: - CHARACTER_LIMIT: 5000 - MAX_AGE: 7d - -jobs: - job: - # Only run this in Git for Windows' fork - if: github.event.repository.owner.login == 'git-for-windows' - runs-on: ubuntu-latest - permissions: - issues: write - strategy: - matrix: - component: - - label: git - feed: https://github.com/git/git/tags.atom - - label: git-lfs - feed: https://github.com/git-lfs/git-lfs/tags.atom - - label: git-credential-manager - feed: https://github.com/git-ecosystem/git-credential-manager/tags.atom - - label: tig - feed: https://github.com/jonas/tig/tags.atom - - label: cygwin - feed: https://github.com/cygwin/cygwin/releases.atom - title-pattern: ^(?!.*newlib) - - label: msys2-runtime-package - feed: https://github.com/msys2/MSYS2-packages/commits/master/msys2-runtime.atom - - label: msys2-runtime - feed: https://github.com/msys2/msys2-runtime/commits/HEAD.atom - aggregate: true - - label: openssh - feed: https://github.com/openssh/openssh-portable/tags.atom - - label: libfido2 - feed: https://github.com/Yubico/libfido2/tags.atom - - label: libcbor - feed: https://github.com/PJK/libcbor/tags.atom - - label: openssl - feed: https://github.com/openssl/openssl/tags.atom - title-pattern: ^(?!.*alpha) - - label: gnutls - feed: https://gnutls.org/news.atom - - label: heimdal - feed: https://github.com/heimdal/heimdal/tags.atom - - label: git-sizer - feed: https://github.com/github/git-sizer/tags.atom - - label: gitflow - feed: https://github.com/petervanderdoes/gitflow-avh/tags.atom - - label: curl - feed: https://github.com/curl/curl/tags.atom - - label: libgpg-error - feed: https://github.com/gpg/libgpg-error/releases.atom - title-pattern: ^libgpg-error-[0-9\.]*$ - - label: libgcrypt - feed: https://github.com/gpg/libgcrypt/releases.atom - title-pattern: ^libgcrypt-[0-9\.]*$ - - label: gpg - feed: https://github.com/gpg/gnupg/releases.atom - - label: mintty - feed: https://github.com/mintty/mintty/releases.atom - - label: 7-zip - feed: https://sourceforge.net/projects/sevenzip/rss?path=/7-Zip - aggregate: true - - label: bash - feed: https://git.savannah.gnu.org/cgit/bash.git/atom/?h=master - aggregate: true - - label: perl - feed: https://github.com/Perl/perl5/tags.atom - title-pattern: ^(?!.*(5\.[0-9]+[13579]|RC)) - - label: pcre2 - feed: https://github.com/PCRE2Project/pcre2/tags.atom - - label: mingw-w64-llvm - feed: https://github.com/msys2/MINGW-packages/commits/master/mingw-w64-llvm.atom - - label: innosetup - feed: https://github.com/jrsoftware/issrc/tags.atom - fail-fast: false - steps: - - uses: git-for-windows/rss-to-issues@v0 - with: - feed: ${{matrix.component.feed}} - prefix: "[New ${{matrix.component.label}} version]" - labels: component-update - github-token: ${{ secrets.GITHUB_TOKEN }} - character-limit: ${{ env.CHARACTER_LIMIT }} - max-age: ${{ env.MAX_AGE }} - aggregate: ${{matrix.component.aggregate}} - title-pattern: ${{matrix.component.title-pattern}} diff --git a/.github/workflows/nano-server.yml b/.github/workflows/nano-server.yml deleted file mode 100644 index 3d943c23d2616d..00000000000000 --- a/.github/workflows/nano-server.yml +++ /dev/null @@ -1,76 +0,0 @@ -name: Windows Nano Server tests - -on: - workflow_dispatch: - -env: - DEVELOPER: 1 - -jobs: - test-nano-server: - runs-on: windows-2022 - env: - WINDBG_DIR: "C:/Program Files (x86)/Windows Kits/10/Debuggers/x64" - IMAGE: mcr.microsoft.com/powershell:nanoserver-ltsc2022 - - steps: - - uses: actions/checkout@v4 - - uses: git-for-windows/setup-git-for-windows-sdk@v1 - - name: build Git - shell: bash - run: make -j15 - - name: pull nanoserver image - shell: bash - run: docker pull $IMAGE - - name: run nano-server test - shell: bash - run: | - docker run \ - --user "ContainerAdministrator" \ - -v "$WINDBG_DIR:C:/dbg" \ - -v "$(cygpath -aw /mingw64/bin):C:/mingw64-bin" \ - -v "$(cygpath -aw .):C:/test" \ - $IMAGE pwsh.exe -Command ' - # Extend the PATH to include the `.dll` files in /mingw64/bin/ - $env:PATH += ";C:\mingw64-bin" - - # For each executable to test pick some no-operation set of - # flags/subcommands or something that should quickly result in an - # error with known exit code that is not a negative 32-bit - # number, and set the expected return code appropriately. - # - # Only test executables that could be expected to run in a UI - # less environment. - # - # ( Executable path, arguments, expected return code ) - # also note space is required before close parenthesis (a - # powershell quirk when defining nested arrays like this) - - $executables_to_test = @( - ("C:\test\git.exe", "", 1 ), - ("C:\test\scalar.exe", "version", 0 ) - ) - - foreach ($executable in $executables_to_test) - { - Write-Output "Now testing $($executable[0])" - &$executable[0] $executable[1] - if ($LASTEXITCODE -ne $executable[2]) { - # if we failed, run the debugger to find out what function - # or DLL could not be found and then exit the script with - # failure The missing DLL or EXE will be referenced near - # the end of the output - - # Set a flag to have the debugger show loader stub - # diagnostics. This requires running as administrator, - # otherwise the flag will be ignored. - C:\dbg\gflags -i $executable[0] +SLS - - C:\dbg\cdb.exe -c "g" -c "q" $executable[0] $executable[1] - - exit 1 - } - } - - exit 0 - '