Skip to content

Commit

Permalink
Merge branch 'stable-1.3.0' into patch-49
Browse files Browse the repository at this point in the history
  • Loading branch information
mosteo authored May 16, 2024
2 parents 380b10d + 473cc1d commit b0013f9
Show file tree
Hide file tree
Showing 8 changed files with 70 additions and 13 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/authorship.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@ jobs:
ref: ${{github.base_ref}}
path: ${{env.CHECKS_REPO}}

- name: Set up nightly `alr`
uses: alire-project/setup-alire@v2
with:
version: nightly
toolchain: --disable-assistant
- name: Set up stable `alr`
uses: alire-project/setup-alire@v3

- name: Test authorship
run: ${{env.CHECKS_REPO}}/scripts/check-author.sh "${{ github.event.pull_request.user.login }}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-native-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fail-fast: false
matrix:
os:
- macos-latest
- macos-12
- ubuntu-latest
- windows-latest

Expand All @@ -50,7 +50,7 @@ jobs:
path: ${{env.CHECKS_REPO}}

- name: Set up devel `alr`
uses: alire-project/setup-alire@v2
uses: alire-project/setup-alire@v3
with:
branch: 'master'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
os:
- macos-latest
- macos-12
- ubuntu-latest
- windows-latest

Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/build-ports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ name: Build Crate (MacPorts)
env:
CHECKS_ORG: alire-project
CHECKS_REPO: alire-index-checks
ALR_VERSION: 2.0.1

on:
pull_request:
Expand All @@ -26,7 +27,7 @@ jobs:
fail-fast: false
matrix:
os:
- macos-latest
- macos-12

steps:
- name: Check out alire-index
Expand All @@ -45,10 +46,10 @@ jobs:
ref: ${{github.base_ref}}
path: ${{env.CHECKS_REPO}}

- name: Set up devel `alr`
uses: alire-project/setup-alire@v2
- name: Set up stable `alr`
uses: alire-project/setup-alire@v3
with:
branch: 'master'
version: ${{env.ALR_VERSION}}

- name: Disable Homebrew
run: rm -f $(which brew)
Expand Down
29 changes: 29 additions & 0 deletions index/el/elogs/elogs-1.2.0.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name = "elogs"
description = "Embedded logging, proven absent of runtime errors"
version = "1.2.0"

authors = ["Kevin Chadwick"]
maintainers = ["Kevin Chadwick <[email protected]>"]
maintainers-logins = ["kevlar700"]
licenses = "ISC OR BSD-2-Clause"
website = "https://github.com/kevlar700/elogs"
tags = ["spark", "embedded", "zfp", "logging", "log"]

[[depends-on]]
gnat = "(>=13 & <2000) | ^11 | >=2020"
# Ada 2022 was not supported until Gnat 11
# Version 12 chokes on Source_Code_Information visibility in Source_Code

[configuration.variables]
Max_Log_Count = {type = "Integer", default = 50}
Max_Message_Length = {type = "Integer", default = 200}
Device_ID_Length = {type = "Integer", default = 12}
Version_Length = {type = "Integer", default = 8}

[build-switches]
"*".ada_version = "Ada2022"

[origin]
commit = "42da537ea13971a33940a47590b39d37fc022d5c"
url = "git+https://github.com/kevlar700/elogs.git"

27 changes: 27 additions & 0 deletions index/ha/hal/hal-0.3.1.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
description = "Hardware Abstraction Layer (HAL)"

long-description = '''# hal
Hardware Abstraction Layer: interfaces definitions to abstract access to common
hardware devices and protocols
This crate is a snapshot of the `hal` in [Ada Drivers
Library](https://github.com/AdaCore/Ada_Drivers_Library/tree/master/hal/src).
Any bug report, issue, contribution must be adressed to the [Ada Drivers
Library](https://github.com/AdaCore/Ada_Drivers_Library/) repo.
'''

name = "hal"
version = "0.3.1"
licenses = "BSD-3-Clause"
maintainers = ["[email protected]"]
maintainers-logins = ["Fabien-Chouteau"]
project-files = ["hal.gpr"]
tags = ["embedded", "hal", "nostd"]

[origin]
commit = "58bb6bd72fc276ba1128451e3b4784b6029be0a8"
url = "git+https://github.com/Fabien-Chouteau/hal.git"

2 changes: 1 addition & 1 deletion index/li/libhello/libhello-1.0.1.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ url = "git+https://github.com/alire-project/libhello.git"

# We use this crate as a trigger to conveniently test minor changes to
# metaprocesses of the CI of the repository itself.
# Last touch: 2024-03-21 14:29:00 CET
# Last touch: 2024-05-16 13:40 CET
3 changes: 3 additions & 0 deletions index/li/libzmq/libzmq-external.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ kind = "system"
[external.origin."case(distribution)"]
"debian|ubuntu" = ["libzmq3-dev"]
msys2 = ["mingw-w64-x86_64-zeromq"]
arch = ["zeromq"]
homebrew = ["zeromq"]
macports = ["zmq"]

0 comments on commit b0013f9

Please sign in to comment.