Skip to content

Commit bc62a23

Browse files
committed
Clean up test changes
Push after previous run is complete.
1 parent dfea377 commit bc62a23

File tree

2 files changed

+0
-158
lines changed

2 files changed

+0
-158
lines changed

.github/workflows/cpp_extra.yml

Lines changed: 0 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,6 @@ jobs:
416416
shell: bash
417417
run: |
418418
vcpkg fetch nuget
419-
# -AL- TEMP disable.
420419
- name: Build
421420
shell: cmd
422421
run: |
@@ -435,150 +434,6 @@ jobs:
435434

436435
# GH-47787 TODO: Build ODBC installer
437436

438-
# TODO remove below workflow
439-
# -AL- check if moving GLib to C++ Extra workflow can still work.
440-
test-glib:
441-
needs: check-labels
442-
name: TEST ONLY AMD64 Windows MSVC GLib
443-
runs-on: windows-2022
444-
if: >-
445-
needs.check-labels.outputs.force == 'true' ||
446-
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra') ||
447-
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra: C++')
448-
timeout-minutes: 240
449-
strategy:
450-
fail-fast: false
451-
env:
452-
ARROW_ACERO: ON
453-
ARROW_BOOST_USE_SHARED: OFF
454-
ARROW_BUILD_BENCHMARKS: OFF
455-
ARROW_BUILD_SHARED: ON
456-
ARROW_BUILD_STATIC: OFF
457-
ARROW_BUILD_TESTS: OFF
458-
ARROW_DATASET: ON
459-
ARROW_DEPENDENCY_SOURCE: VCPKG
460-
ARROW_DEPENDENCY_USE_SHARED: OFF
461-
ARROW_FLIGHT: ON
462-
ARROW_FLIGHT_SQL: ON
463-
ARROW_GANDIVA: OFF
464-
ARROW_GLIB_VAPI: "false"
465-
ARROW_HDFS: OFF
466-
ARROW_HOME: "${{ github.workspace }}/dist"
467-
ARROW_JEMALLOC: OFF
468-
ARROW_MIMALLOC: ON
469-
ARROW_ORC: OFF
470-
ARROW_PARQUET: ON
471-
ARROW_SUBSTRAIT: OFF
472-
ARROW_USE_GLOG: OFF
473-
ARROW_VERBOSE_THIRDPARTY_BUILD: OFF
474-
ARROW_WITH_BROTLI: OFF
475-
ARROW_WITH_BZ2: OFF
476-
ARROW_WITH_LZ4: OFF
477-
ARROW_WITH_OPENTELEMETRY: OFF
478-
ARROW_WITH_SNAPPY: ON
479-
ARROW_WITH_ZLIB: ON
480-
ARROW_WITH_ZSTD: ON
481-
CMAKE_CXX_STANDARD: "20"
482-
CMAKE_GENERATOR: Ninja
483-
CMAKE_INSTALL_PREFIX: "${{ github.workspace }}/dist"
484-
VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite'
485-
VCPKG_DEFAULT_TRIPLET: x64-windows
486-
permissions:
487-
packages: write
488-
steps:
489-
- name: Disable Crash Dialogs
490-
run: |
491-
reg add `
492-
"HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting" `
493-
/v DontShowUI `
494-
/t REG_DWORD `
495-
/d 1 `
496-
/f
497-
- name: Checkout Arrow
498-
uses: actions/checkout@v6
499-
with:
500-
fetch-depth: 0
501-
submodules: recursive
502-
- name: Install meson
503-
run: |
504-
python -m pip install meson
505-
- name: Install ccache
506-
shell: bash
507-
run: |
508-
ci/scripts/install_ccache.sh 4.6.3 /usr
509-
- name: Setup ccache
510-
shell: bash
511-
run: |
512-
ci/scripts/ccache_setup.sh
513-
- name: ccache info
514-
id: ccache-info
515-
shell: bash
516-
run: |
517-
echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
518-
- name: Cache ccache
519-
uses: actions/cache@v5
520-
with:
521-
path: ${{ steps.ccache-info.outputs.cache-dir }}
522-
key: glib-ccache-msvc-${{ env.CACHE_VERSION }}-${{ hashFiles('cpp/**') }}
523-
restore-keys: glib-ccache-msvc-${{ env.CACHE_VERSION }}-
524-
env:
525-
# We can invalidate the current cache by updating this.
526-
CACHE_VERSION: "2024-05-09"
527-
- name: Checkout vcpkg
528-
uses: actions/checkout@v6
529-
with:
530-
fetch-depth: 0
531-
path: vcpkg
532-
repository: microsoft/vcpkg
533-
- name: Bootstrap vcpkg
534-
run: |
535-
vcpkg\bootstrap-vcpkg.bat
536-
$VCPKG_ROOT = $(Resolve-Path -LiteralPath "vcpkg").ToString()
537-
Write-Output ${VCPKG_ROOT} | `
538-
Out-File -FilePath ${Env:GITHUB_PATH} -Encoding utf8 -Append
539-
Write-Output "VCPKG_ROOT=${VCPKG_ROOT}" | `
540-
Out-File -FilePath ${Env:GITHUB_ENV} -Encoding utf8 -Append
541-
- name: Setup NuGet credentials for vcpkg caching
542-
shell: bash
543-
run: |
544-
$(vcpkg fetch nuget | tail -n 1) \
545-
sources add \
546-
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json" \
547-
-storepasswordincleartext \
548-
-name "GitHub" \
549-
-username "$GITHUB_REPOSITORY_OWNER" \
550-
-password "${{ secrets.GITHUB_TOKEN }}"
551-
$(vcpkg fetch nuget | tail -n 1) \
552-
setapikey "${{ secrets.GITHUB_TOKEN }}" \
553-
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"
554-
#-AL- for testing, remove later.
555-
- name: Show vcpkg NuGet pwsh
556-
shell: pwsh
557-
run: |
558-
vcpkg fetch nuget
559-
- name: Show vcpkg NuGet bash
560-
shell: bash
561-
run: |
562-
vcpkg fetch nuget
563-
- name: Build C++
564-
shell: cmd
565-
run: |
566-
$env:VCPKG_DEBUG = "1"
567-
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
568-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
569-
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
570-
# -AL- Below line returns 403 error also.
571-
# But somehow the `cpp_build.sh` vcpkg build succeeds.
572-
# vcpkg install abseil --debug
573-
bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
574-
- name: Build GLib
575-
shell: cmd
576-
run: |
577-
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
578-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
579-
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
580-
bash -c "ci/scripts/c_glib_build.sh $(pwd) $(pwd)/build"
581-
582437
report-extra-cpp:
583438
if: github.event_name == 'schedule' && always()
584439
needs:
@@ -587,6 +442,5 @@ jobs:
587442
- jni-macos
588443
- msvc-arm64
589444
- odbc
590-
- test-glib
591445
uses: ./.github/workflows/report_ci.yml
592446
secrets: inherit

.github/workflows/ruby.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -422,25 +422,13 @@ jobs:
422422
$(vcpkg fetch nuget | tail -n 1) \
423423
setapikey "${{ secrets.GITHUB_TOKEN }}" \
424424
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"
425-
#-AL- for testing, remove later.
426-
- name: Show vcpkg NuGet pwsh
427-
shell: pwsh
428-
run: |
429-
vcpkg fetch nuget
430-
- name: Show vcpkg NuGet bash
431-
shell: bash
432-
run: |
433-
vcpkg fetch nuget
434425
- name: Build C++
435426
shell: cmd
436427
run: |
437428
$env:VCPKG_DEBUG = "1"
438429
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
439430
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
440431
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
441-
# -AL- Below line returns 403 error also.
442-
# But somehow the `cpp_build.sh` vcpkg build succeeds.
443-
# vcpkg install abseil --debug
444432
bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
445433
- name: Build GLib
446434
shell: cmd

0 commit comments

Comments
 (0)