diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index a01ad2d05..590cb60c6 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -32,8 +32,18 @@ jobs: with: submodules: true + - name: OS information for ${{ matrix.tag }} + uses: mosteo-actions/docker-run@v2 + with: + image: ghcr.io/alire-project/docker/gnat:${{matrix.tag}} + command: | + lsb_release -a || \ + cat /etc/os-release || \ + cat /etc/system-release || \ + echo "No lsb_release information" + - name: Run test script (${{ matrix.tag }}) - uses: mosteo-actions/docker-run@v1 + uses: mosteo-actions/docker-run@v2 with: image: ghcr.io/alire-project/docker/gnat:${{matrix.tag}} command: scripts/ci-github.sh diff --git a/alire.toml b/alire.toml index 2cbbc4cad..e6267d012 100644 --- a/alire.toml +++ b/alire.toml @@ -50,6 +50,7 @@ windows = { ALIRE_OS = "windows" } # Some dependencies require precise versions during the development cycle: [[pins]] + [pins.aaa] url = "https://github.com/mosteo/aaa" commit = "0c3b440ac183c450345d4a67d407785678779aae" @@ -60,7 +61,7 @@ commit = "da4e59c382ceb0de6733d571ecbab7ea4919b33d" [pins.c_strings] url = "https://github.com/mosteo/cstrings" -commit = "e5b1931d47b9fee273177773fb5e3f8979bc6076" +commit = "e4d58ad90bf32bc44304197e5906a519f5a9a7bf" [pins.clic] url = "https://github.com/alire-project/clic" @@ -68,7 +69,7 @@ commit = "56bbdc008e16996b6f76e443fd0165a240de1b13" [pins.den] url = "https://github.com/mosteo/den" -commit = "1f0fe7df0e479e1bf86edd607ffea6bfddb9352e" +commit = "74ec97ba66b56dea23a963deef12ad72b5b1c731" [pins.dirty_booleans] url = "https://github.com/mosteo/dirty_booleans" diff --git a/deps/cstrings b/deps/cstrings index e5b1931d4..e4d58ad90 160000 --- a/deps/cstrings +++ b/deps/cstrings @@ -1 +1 @@ -Subproject commit e5b1931d47b9fee273177773fb5e3f8979bc6076 +Subproject commit e4d58ad90bf32bc44304197e5906a519f5a9a7bf diff --git a/deps/den b/deps/den index 203512fcb..74ec97ba6 160000 --- a/deps/den +++ b/deps/den @@ -1 +1 @@ -Subproject commit 203512fcb05ec0e837269f1f156dae513f605077 +Subproject commit 74ec97ba66b56dea23a963deef12ad72b5b1c731 diff --git a/scripts/ci-github.sh b/scripts/ci-github.sh index 06800270e..55da4a081 100755 --- a/scripts/ci-github.sh +++ b/scripts/ci-github.sh @@ -61,9 +61,18 @@ if [ "${INDEX:-}" != "" ]; then alr index --name default --add "$INDEX" fi +echo ALR SETTINGS (global): +alr settings --global + echo ALR SEARCH: # List releases for the record -alr -q -d search --list --external +alr -q -d search --list --external || \ +{ + echo "Failed to list releases" + echo CONTENTS OF INDEXES + ls -alFR /root/.config/alire/indexes/ + exit 1; +} echo ............................ echo TESTSUITE: diff --git a/src/alire/alire-directories.adb b/src/alire/alire-directories.adb index ef1de9da6..6f3bb4f09 100644 --- a/src/alire/alire-directories.adb +++ b/src/alire/alire-directories.adb @@ -408,6 +408,10 @@ package body Alire.Directories is begin Stop := False; + Trace.Debug ("Find_Files_Under:" + & Item.Depth'Image + & " " & Item.Path); + if Max_Depth < Natural'Last and then Item.Depth > Max_Depth then Enter := False; end if;