[cygport - the Cygwin packaging tool] branch master, updated. 0.34.2-10-g090e3ba

Jon TURNEY jturney@sourceware.org
Mon May 2 19:04:29 GMT 2022




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=090e3ba936b5dd60b1c123358ef7114ab5c06ab9

commit 090e3ba936b5dd60b1c123358ef7114ab5c06ab9
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Mon May 2 00:51:15 2022 +0100

    Updates to tests for package updates
    
    * Set git safe.directory to avoid git paranoia (It's important we use
    --system rather than --global, as the latter modifies ~/.gitconfig and
    we run tests with HOME overriden)
    * gtk-doc should depend on python3-pygments
    * mingw64-i686-crypt no longer requires mingw64-i686-gcc-core (probably
    for libgcc?)


Diff:
---
 .github/workflows/cygwin.yml                                       | 7 ++++++-
 .../dist/mingw64-i686-crypt/mingw64-i686-crypt-2.1-1.hint          | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index 16b0e0b..be1c9c3 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -102,6 +102,7 @@ jobs:
         python38-pip,^
         python38-setuptools,^
         python38-wheel,^
+        python38-pygments,^
         python39-pip,^
         python39-setuptools,^
         python39-wheel,^
@@ -115,11 +116,15 @@ jobs:
       shell: cmd
     - name: Set PATH
       run: echo "PATH=C:\cygwin64\bin;C:\cygwin64\lib\lapack;%SYSTEMROOT%\system32" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-    - name: Fix python version skew
+    - name: Fixup Cygwin installation
       run: |
+        bash --login
         bash -c '/usr/sbin/alternatives --set python /usr/bin/python3.8 ; /usr/sbin/alternatives --set python3 /usr/bin/python3.8'
         bash -c 'sed -i s#/usr/bin/python\$#/usr/bin/python3.9# /usr/bin/pip3.9'
         bash -c 'sed -i s@#!/bin/python\$@#!/bin/python2@ /usr/bin/bzr'
+        bash -c 'git config --system --add safe.directory /cygdrive/d/a/cygport/cygport'
+        bash -c 'git config --system --add safe.directory /cygdrive/d/a/cygport/cygport/data/gnuconfig'
+      continue-on-error: true
     - name: Build
       run: |
         bash -c 'meson _build && ninja -C _build'
diff --git a/testsuite/cross/make/hints/mingw64-i686-crypt-2.1-1.noarch/dist/mingw64-i686-crypt/mingw64-i686-crypt-2.1-1.hint b/testsuite/cross/make/hints/mingw64-i686-crypt-2.1-1.noarch/dist/mingw64-i686-crypt/mingw64-i686-crypt-2.1-1.hint
index 0f34bfb..1319ebf 100644
--- a/testsuite/cross/make/hints/mingw64-i686-crypt-2.1-1.noarch/dist/mingw64-i686-crypt/mingw64-i686-crypt-2.1-1.hint
+++ b/testsuite/cross/make/hints/mingw64-i686-crypt-2.1-1.noarch/dist/mingw64-i686-crypt/mingw64-i686-crypt-2.1-1.hint
@@ -1,5 +1,5 @@
 category: Devel
-requires: mingw64-i686-gcc-core 
+requires:  
 sdesc: "crypt(3) library for Win32 toolchain"
 ldesc: "This packages provides a library which exports the functions
 crypt(3), encrypt(3), and setkey(3).  The created passwords are 56 bit DES



More information about the Cygwin-apps-cvs mailing list