From 54b71041b60eab1c3b43d2ec83be202afeefa1e5 Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Mon, 19 Jan 2026 12:27:39 -0600 Subject: [PATCH] CI: Drop references to Appveyor and Travis --- .github/workflows/linux.yml | 4 -- .github/workflows/osx.yml | 4 -- .github/workflows/ubsan.yml | 4 -- .github/workflows/windows.yml | 4 -- .travis.yml | 92 ---------------------------- NTMakefile | 5 -- README.md | 2 - appveyor.yml | 85 ------------------------- doc/NTMakefile | 4 +- packages/windows/assembly/NTMakefile | 10 --- 10 files changed, 1 insertion(+), 213 deletions(-) delete mode 100644 .travis.yml delete mode 100644 appveyor.yml diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 36ea4ac2c..f92e1c097 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -23,8 +23,6 @@ on: - '**/INSTALL' - '**/README*' - '.github/workflows/linux.yml' - - '!appveyor.yml' - - '!.travis.yml' pull_request: paths: @@ -45,8 +43,6 @@ on: - '**/INSTALL' - '**/README*' - '.github/workflows/linux.yml' - - '!appveyor.yml' - - '!.travis.yml' jobs: unix: diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index b5daf5d11..ff6ae88ff 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -24,8 +24,6 @@ on: - '**/INSTALL' - '**/README*' - '.github/workflows/osx.yml' - - '!appveyor.yml' - - '!.travis.yml' pull_request: paths: @@ -46,8 +44,6 @@ on: - '**/INSTALL' - '**/README*' - '.github/workflows/osx.yml' - - '!appveyor.yml' - - '!.travis.yml' jobs: osx: diff --git a/.github/workflows/ubsan.yml b/.github/workflows/ubsan.yml index 72fc92119..079de03f1 100644 --- a/.github/workflows/ubsan.yml +++ b/.github/workflows/ubsan.yml @@ -23,8 +23,6 @@ on: - '**/INSTALL' - '**/README*' - '.github/workflows/ubsan.yml' - - '!appveyor.yml' - - '!.travis.yml' pull_request: paths: @@ -45,8 +43,6 @@ on: - '**/INSTALL' - '**/README*' - '.github/workflows/ubsan.yml' - - '!appveyor.yml' - - '!.travis.yml' jobs: unix: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 98bb78449..c3e330b4c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -23,8 +23,6 @@ on: - '**/INSTALL' - '**/README*' - '.github/workflows/windows.yml' - - '!appveyor.yml' - - '!.travis.yml' pull_request: paths: @@ -44,8 +42,6 @@ on: - '**/INSTALL' - '**/README*' - '.github/workflows/windows.yml' - - '!appveyor.yml' - - '!.travis.yml' jobs: windows: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 1a1f587e6..000000000 --- a/.travis.yml +++ /dev/null @@ -1,92 +0,0 @@ -os: - - linux - - osx - -language: c - -env: - global: - secure: "YKG77M7zMvJ+IeV2ziw//HcHqMqFoAzIZlE99Yw/aOn5pvMYKq6Ep7EFVhbfDu9yN0T7M5csCGQeH7/ylDlsZSRMUw72844ezMDM8e10T/lW/T/OYN7j1ZVHh3WSJgS+1D9VG6/Y0OY1Si3lb7PcOdAIU0fPJV5xQONN2+hpJeI=" - -before_install: - - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get update -qq; fi - - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get install -qq bison comerr-dev flex libcap-ng-dev libdb-dev libedit-dev libjson-perl libldap2-dev libncurses5-dev libperl4-corelibs-perl libsqlite3-dev libkeyutils-dev pkg-config python ss-dev texinfo unzip netbase keyutils; fi - - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get install -qq ldap-utils gdb apport; fi - - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get install -qq curl libmicrohttpd-dev; fi - - if [ $TRAVIS_OS_NAME = linux -a -n "$COVERAGE" ]; then sudo apt-get install -qq jq; fi - - if [ $TRAVIS_OS_NAME = osx ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install cpanm bison flex berkeley-db lmdb openldap openssl; fi - - if [ $TRAVIS_OS_NAME = osx ]; then sudo cpanm install JSON; fi - - if [ $TRAVIS_OS_NAME = osx -a -n "$COVERAGE" ]; then brew install jq; fi - - mkdir ci-build - - mkdir coverity-build - - ./autogen.sh - -install: - - cd ci-build - - | - if [ $TRAVIS_OS_NAME = osx ]; then - LDFLAGS="-L/usr/local/opt/berkeley-db/lib -L/usr/local/opt/lmdb/lib" \ - CFLAGS="-I/usr/local/opt/lmdb/include" \ - ../configure \ - --srcdir=`dirname "$PWD"` \ - --prefix=/tmp/heimdal \ - --enable-maintainer-mode $COVERAGE \ - --enable-static=no \ - --enable-pthread-support \ - --disable-afs-support \ - --disable-ndbm-db \ - --with-openldap=/usr/local/opt/openldap \ - --with-openssl=/usr/local/opt/openssl/ \ - --with-hcrypto-default-backend=ossl \ - --with-berkeley-db \ - --with-berkeley-db-include=/usr/local/opt/berkeley-db/include - else - # This list of -Wno-error options should be reduced over time where possible - if [ x"$TRAVIS_COMPILER" != x"clang" ]; then - CFLAGS="-Wno-error=empty-body -Wno-error=shadow -Wno-error=unused-value -Wno-error=bad-function-cast -Wno-error=unused-function -Wno-error=unused-result -Wno-error=deprecated-declarations" ../configure --enable-developer --srcdir=`dirname "$PWD"` --enable-maintainer-mode $COVERAGE - else - CFLAGS="-Wno-error=shadow -Wno-error=bad-function-cast -Wno-error=unused-function -Wno-error=unused-result -Wno-error=deprecated-declarations" ../configure --enable-developer --srcdir=`dirname "$PWD"` --enable-maintainer-mode $COVERAGE - fi - fi - - ulimit -c unlimited; make -j3 - -script: - - if [ x${COVERITY_SCAN_BRANCH} != x1 ]; then ulimit -c unlimited; make check${MAKE_CHECK_SUFFIX}; fi - -after_script: - - if [ -n "$COVERAGE" ]; then ../tools/coveralls-tool -O $PWD -S ..; fi - - find . -name \*.log -print0|xargs -0 grep '^==[1-9]' - -after_failure: - - find . -name test-suite.log -print0 | xargs -0 cat - - if [ $TRAVIS_OS_NAME = linux ]; then echo "thread apply all bt" > x; find . -name core -print | while read core; do gdb -batch -x x `file "$core"|sed -e "s/^[^']*'//" -e "s/[ '].*$//"` "$core"; done; fi - - if [ $TRAVIS_OS_NAME = osx ]; then find . -name core -print | while read core; do echo bt | lldb --core "$core" `file "$core"|sed -e "s/^[^']*'//" -e "s/[ '].*$//"` "$core"; done; fi - -compiler: - - clang - - gcc - -matrix: - include: - - os: linux - compiler: gcc - env: COVERAGE=--enable-gcov - exclude: - - os: osx - compiler: gcc - -notifications: - email: - on_success: change - on_failure: always - -addons: - - coverity_scan: - project: - name: "heimdal/heimdal" - description: "Build submitted via Travis CI" - notification_email: heimdal-builders@secure-endpoints.com - build_command_prepend: ../configure --enable-maintainer-mode - build_command: make - branch_pattern: coverity_scan diff --git a/NTMakefile b/NTMakefile index adf04f845..9848a7897 100644 --- a/NTMakefile +++ b/NTMakefile @@ -33,13 +33,8 @@ thirdparty=thirdparty !endif -!ifdef APPVEYOR -SUBDIRS = include lib kuser kdc admin kadmin kpasswd appl \ - tools tests packages etc -!else SUBDIRS = include lib kuser kdc admin kadmin kpasswd appl doc \ tools tests packages etc $(thirdparty) packages\windows\installer -!endif !include windows/NTMakefile.w32 diff --git a/README.md b/README.md index 5e49fd0e1..93acf7c2a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ [![GitHub Build Workflow](https://github.com/heimdal/heimdal/actions/workflows/linux.yml/badge.svg)](https://github.com/heimdal/heimdal/actions?query=workflow%3Alinux) [![GitHub Build Workflow](https://github.com/heimdal/heimdal/actions/workflows/osx.yml/badge.svg)](https://github.com/heimdal/heimdal/actions?query=workflow%3Aosx) [![GitHub Build Workflow](https://github.com/heimdal/heimdal/actions/workflows/windows.yml/badge.svg)](https://github.com/heimdal/heimdal/actions?query=workflow%3Awindows) -[![Appveyor-CI build (Windows)](https://ci.appveyor.com/api/projects/status/6j0k0m7kd6jjj4tw/branch/master?svg=true)](https://ci.appveyor.com/project/heimdal/heimdal/branch/master) [![Coverage Status](https://coveralls.io/repos/github/heimdal/heimdal/badge.svg?branch=master)](https://coveralls.io/github/heimdal/heimdal?branch=master) Heimdal @@ -35,5 +34,4 @@ Build Status [![GitHub Build Workflow](https://github.com/heimdal/heimdal/actions/workflows/linux.yml/badge.svg)](https://github.com/heimdal/heimdal/actions?query=workflow%3Alinux) [![GitHub Build Workflow](https://github.com/heimdal/heimdal/actions/workflows/osx.yml/badge.svg)](https://github.com/heimdal/heimdal/actions?query=workflow%3Aosx) [![GitHub Build Workflow](https://github.com/heimdal/heimdal/actions/workflows/windows.yml/badge.svg)](https://github.com/heimdal/heimdal/actions?query=workflow%3Awindows) -[![Appveyor-CI build (Windows)](https://ci.appveyor.com/api/projects/status/6j0k0m7kd6jjj4tw/branch/master?svg=true)](https://ci.appveyor.com/project/heimdal/heimdal/branch/master) [![Coverage Status](https://coveralls.io/repos/github/heimdal/heimdal/badge.svg?branch=master)](https://coveralls.io/github/heimdal/heimdal?branch=master) diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index fa56c4c59..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,85 +0,0 @@ -# -# This file tells appveyor.com how to build Heimdal on Windows. -# Appveyor is a continuous integration (CI) service for github and other -# users, and is free for public repositories. -# - -version: '1.0.{build}' - -image: - - Visual Studio 2019 - -install: - # HACK -- pacman installation in Appveyor seems broken - # Taken from https://github.com/johnkerl/miller/blob/master/appveyor.yml - # (which is gone) - #- ps: dir 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows' -Recurse - - set "PATH=C:\msys64\usr\bin;%PATH%" - - set "PATH=C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%" - - bash -lc "mkdir -p /var/lib/pacman/sync/" - - bash -lc "pacman-key --init" - - bash -lc "pacman-key --populate msys2" - - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-1~20211228-1-any.pkg.tar.zst" - - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-1~20211228-1-any.pkg.tar.zst.sig" - - bash -lc "pacman --noconfirm -U --config <(echo) msys2-keyring-1~20211228-1-any.pkg.tar.zst" - - bash -lc "mkdir -p /var/lib/pacman/sync/" - - bash -lc "pacman-key --init" - - bash -lc "pacman-key --populate msys2" - - bash -lc "pacman -S --noconfirm --refresh pacman" - - bash -lc "pacman -S --needed --noconfirm pacman-mirrors" - - bash -lc "pacman -S --needed --noconfirm mingw-w64-x86_64-toolchain autoconf automake libtool make patch mingw-w64-x86_64-libtool" - - bash -lc "pacman -S --needed --noconfirm bison flex" - - bash -lc "pacman -S --needed --noconfirm perl perl-JSON" - -build_script: - # build using Windows 10 SDK - - set "WINSDKVER=10.0.22000.0" - - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 %WINSDKVER% - - set "WIXDIR=c:\Program Files (x86)\Windows Installer XML v3.5" - # We're not doing any codesigning in the Appveyor build yet. - - SET "CODESIGN_PKT=0000000000000000" - - set "PATH=%PATH%;C:\Perl64\bin;C:\tools\cygwin\bin;C:\Program Files (x86)\HTML Help Workshop" - - set "PATH=%PATH%;C:/msys64/usr/bin" - - set "PATH=%PATH%;C:\program files (x86)\windows installer xml v3.5\bin;C:\cygwin\bin" - # double check this, should it be x86 or x64? - - set "PATH=%PATH%;%WindowsSdkVerBinPath%\x86" - - set "PATH=C:\Python310-x64;%PATH%" - - set dbg__type=Debug - - title Heimdal Build %CPU% %dbg__type% - - echo PATH=%PATH% - # target Windows 10 API - - set APPVER=10.0 - # Newer texinfo has no .exe's, so we have to invoke it as - # "perl ...\makeinfo ...". See doc/NTMakefile. - - nmake /f NTMakefile APPVEYOR=1 MAKEINFO=makeinfo NO_INSTALLERS=1 - - 7z a heimdal.zip C:\projects\heimdal - -test_script: - # Packages are not validated in the Appveyor build, FYI. - - nmake /f NTMakefile APPVEYOR=1 MAKEINFO=makeinfo NO_INSTALLERS=1 test - -artifacts: - - path: heimdal-out.zip - name: heimdal-out - - path: heimdal.zip - name: heimdal - -on_failure: - - 7z a heimdal-out.zip C:\projects\heimdal - - appveyor PushArtifact heimdal-out.zip - -# To get RDP access to an appveyor worker for debugging a build, just -# uncomment these next two lines and the last two lines too. -#init: -# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - -# Uncomment this to allow the RDP session to continue after the build -# finishes. -# -# There's a delete-me file on the desktop that one should delete when -# one is done with the worker. RDP sessions are capped at 60 minutes as -# of this writing. -# -#on_finish: -# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - diff --git a/doc/NTMakefile b/doc/NTMakefile index 4769c9126..20d4619fe 100644 --- a/doc/NTMakefile +++ b/doc/NTMakefile @@ -61,9 +61,7 @@ hx509_TEXINFOS = \ MAKEINFOFLAGS = --css-include=$(SRCDIR)/heimdal.css -!ifdef APPVEYOR -MAKEINFO = $(PERL) C:\msys64\usr\bin\makeinfo -!endif +# MAKEINFO = $(PERL) C:\msys64\usr\bin\makeinfo ###################################################################### # Build heimdal.chm diff --git a/packages/windows/assembly/NTMakefile b/packages/windows/assembly/NTMakefile index 37ce5553d..b5a72bb28 100644 --- a/packages/windows/assembly/NTMakefile +++ b/packages/windows/assembly/NTMakefile @@ -108,13 +108,8 @@ all:: asm-krb clean:: -$(RM) $(ASMKRBDIR)\*.* -!ifdef APPVEYOR -test:: - true -!else test:: $(MT) -manifest $(ASMKRBDIR)\$(ASMKRBMAN) -validate_manifest -!endif {$(BINDIR)}.dll{$(ASMKRBDIR)}.dll: $(CP) $< $@ @@ -137,13 +132,8 @@ $(APPMANIFEST): Heimdal.Application.manifest.in -e "s,[@]cpu[@],$(MCPU),g" \ -e "s,[@]pkt[@],$(CODESIGN_PKT),g" < $** > $@ -!ifdef APPVEYOR -test:: - true -!else test:: $(MT) -manifest $(APPMANIFEST) -validate_manifest -!endif # ---------------------------------------------------------------------- # Publisher configuration files