Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix traversal of dirs containing troublesome softlinks #1718

Merged
merged 5 commits into from
Aug 7, 2024
+182 −175
Merged

Fix traversal of dirs containing troublesome softlinks #1718

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49b93ee
Fix enumeration of files with troublesome softlinks
mosteo Jul 11, 2024
23c8525
Self-review
mosteo Jul 12, 2024
5e15e40
Workaround in `den` for GCC 14 C++ bug
mosteo Jul 29, 2024
024e95c
2nd self-review
mosteo Aug 2, 2024
e56f39e
Merge remote-tracking branch 'alire/master' into fix/traversal
mosteo Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .github/workflows/ci-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,9 @@
[submodule "deps/dirty_booleans"]
path = deps/dirty_booleans
url = https://github.com/mosteo/dirty_booleans
[submodule "deps/den"]
path = deps/den
url = https://github.com/mosteo/den
[submodule "deps/cstrings"]
path = deps/cstrings
url = https://github.com/mosteo/cstrings
2 changes: 2 additions & 0 deletions alire.gpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ with "ada_toml";
with "alire_common";
with "ajunitgen";
with "ansiada";
with "c_strings";
with "clic";
with "den";
with "dirty_booleans";
with "diskflags";
with "gnatcoll";
Expand Down
13 changes: 12 additions & 1 deletion alire.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ aaa = "~0.3.0"
ada_toml = "~0.3"
ajunitgen = "^1.0.1"
ansiada = "^1.0"
c_strings = "^1.0"
clic = "~0.3"
den = "~0.1"
dirty_booleans = "~0.1"
diskflags = "~0.1"
gnatcoll = "^21"
Expand Down Expand Up @@ -48,18 +50,27 @@ windows = { ALIRE_OS = "windows" }

# Some dependencies require precise versions during the development cycle:
[[pins]]

[pins.aaa]
url = "https://github.com/mosteo/aaa"
commit = "dff61d2615cc6332fa6205267bae19b4d044b9da"
commit = "0c3b440ac183c450345d4a67d407785678779aae"

[pins.ada_toml]
url = "https://github.com/mosteo/ada-toml"
commit = "da4e59c382ceb0de6733d571ecbab7ea4919b33d"

[pins.c_strings]
url = "https://github.com/mosteo/cstrings"
commit = "e4d58ad90bf32bc44304197e5906a519f5a9a7bf"

[pins.clic]
url = "https://github.com/alire-project/clic"
commit = "56bbdc008e16996b6f76e443fd0165a240de1b13"

[pins.den]
url = "https://github.com/mosteo/den"
commit = "28fb91bd46695c49822adab0cac51a31e86cda68"

[pins.dirty_booleans]
url = "https://github.com/mosteo/dirty_booleans"
commit = "05c40d88ecfe109e575ec8b21dd6ffa2e61df1dc"
Expand Down
2 changes: 2 additions & 0 deletions alr_env.gpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ aggregate project Alr_Env is
"deps/ajunitgen",
"deps/ansi",
"deps/clic",
"deps/cstrings",
"deps/den",
"deps/dirty_booleans",
"deps/diskflags",
"deps/gnatcoll-slim",
Expand Down
2 changes: 1 addition & 1 deletion deps/aaa
Open in desktop
Submodule aaa updated 5 files
+2 −2 config/aaa_config.ads
+35 −3 config/aaa_config.gpr
+2 −2 config/aaa_config.h
+21 −0 src/aaa-strings.adb
+11 −0 src/aaa-strings.ads
1 change: 1 addition & 0 deletions deps/cstrings
Open in desktop
Submodule cstrings added at e4d58a
1 change: 1 addition & 0 deletions deps/den
Open in desktop
Submodule den added at 28fb91
8 changes: 6 additions & 2 deletions scripts/ci-github.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ echo GNAT VERSION:
gnatls -v
echo ............................

echo ALR VERSION:
alr version
echo "ALR VERSION (at $(which alr)):"
alr -d version
echo ............................

# Set up index if not default:
Expand All @@ -61,6 +61,10 @@ if [ "${INDEX:-}" != "" ]; then
alr index --name default --add "$INDEX"
fi

echo "ALR SETTINGS (global):"
alr settings --global
echo ............................

echo ALR SEARCH:
# List releases for the record
alr -q -d search --list --external
Expand Down
Loading
Loading