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.

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

Minor clean-ups and clarifications #1568

Merged
merged 1 commit into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions alire.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ windows = { ALIRE_OS = "windows" }
aaa = { url = "https://github.com/mosteo/aaa", commit = "dff61d2615cc6332fa6205267bae19b4d044b9da" }
ada_toml = { url = "https://github.com/mosteo/ada-toml", commit = "da4e59c382ceb0de6733d571ecbab7ea4919b33d" }
clic = { url = "https://github.com/alire-project/clic", commit = "de0330053584bad4dbb3dbd5e1ba939c4e8c6b55" }
dirty_booleans = { url = "https://github.com/mosteo/dirty_booleans", branch = "main" }
diskflags = { url = "https://github.com/mosteo/diskflags", branch = "main" }
dirty_booleans = { url = "https://github.com/mosteo/dirty_booleans", branch = "alire" }
diskflags = { url = "https://github.com/mosteo/diskflags", branch = "alire" }
gnatcoll = { url = "https://github.com/alire-project/gnatcoll-core.git", commit = "4e663b87a028252e7e074f054f8f453661397166" }
minirest = { url = "https://github.com/mosteo/minirest.git", commit = "9a9c660f9c6f27f5ef75417e7fac7061dff14d78" }
semantic_versioning = { url = "https://github.com/alire-project/semantic_versioning", commit = "2f23fc5f6b4855b836b599adf292fed9c0ed4144" }
Expand Down
11 changes: 6 additions & 5 deletions src/alire/alire-properties-actions-executor.ads
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ package Alire.Properties.Actions.Executor is
Env : Properties.Vector;
Moment : Moments);
-- Run Release actions that apply to a given environment. IMPORTANT: the
-- working directory at the moment of this call should be the workspace
-- root. Recommended for toolchains or direct execution only (e.g. `alr
-- action`), otherwise better use the previous call that takes into account
-- the Root context. Will raise Action_Failed if the spawned command exits
-- with failure. Will not skip post-fetch even if already run.
-- working directory at the moment of this call should be the release (not
-- workspace!) root. Recommended for toolchains or direct execution only
-- (e.g. `alr action`), otherwise better use the previous call that takes
-- into account the Root context. Will raise Action_Failed if the spawned
-- command exits with failure. Will not skip post-fetch even if already
-- run.

procedure Execute_Actions
(Release : Releases.Release;
Expand Down
1 change: 0 additions & 1 deletion testsuite/tests/solver/compiler-priorities/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
Those prefer first a native compiler. This case is out of scope of this test.
"""

import subprocess
import re

from drivers.alr import run_alr, init_local_crate, alr_with
Expand Down
9 changes: 4 additions & 5 deletions testsuite/tests/solver/compiler-selected/test.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
"""
Check solving with a configured preferred compiler
Check solving with a configured preferred compiler. When the selected compiler
fulfills the dependency, it is preferred over other available but not installed
compilers.
"""

import subprocess
import os

from drivers.alr import run_alr, init_local_crate, alr_with
from drivers.asserts import assert_eq, assert_match, match_solution
from re import escape as e
from drivers.asserts import match_solution

# Select the default preferred compiler, which is the native packaged one
run_alr("toolchain", "--select")
Expand Down
Loading