Skip to content

Commit

Permalink
Merge branch 'stable-1.3.0' into ado-1.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mosteo authored Oct 14, 2024
2 parents 9aab33f + 50e68d2 commit b39cb68
Show file tree
Hide file tree
Showing 26 changed files with 573 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/authorship.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
path: ${{env.CHECKS_REPO}}

- name: Set up stable `alr`
uses: alire-project/setup-alire@v3
uses: alire-project/setup-alire@v4

- name: Test authorship
run: ${{env.CHECKS_REPO}}/scripts/check-author.sh "${{ github.event.pull_request.user.login }}"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-distros.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: Build Crate (Distro toolchain)
env:
CHECKS_ORG: alire-project
CHECKS_REPO: alire-index-checks
ALR_VERSION: 2.0.1
ALR_VERSION: 2.0.2

on:
pull_request:
Expand Down Expand Up @@ -54,14 +54,14 @@ jobs:

- name: Set up stable `alr`
if: contains(github.base_ref, 'stable-')
uses: alire-project/setup-alire@v3
uses: alire-project/setup-alire@v4
with:
toolchain: --disable-assistant # We want to use the external ones in this workflow
version: ${{env.ALR_VERSION}}

- name: Set up devel `alr`
if: contains(github.base_ref, 'devel-')
uses: alire-project/setup-alire@v3
uses: alire-project/setup-alire@v4
with:
toolchain: --disable-assistant # We want to use the external ones in this workflow
branch: master
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/build-native-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ jobs:
fail-fast: false
matrix:
os:
# - macos-12 # TODO: To be diagnosed
- macos-13 # amd64
- macos-latest # arm64
- ubuntu-latest
- windows-latest

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

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

Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/build-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Build Crate (Alire toolchain)
env:
CHECKS_ORG: alire-project
CHECKS_REPO: alire-index-checks
ALR_VERSION: 2.0.1
ALR_VERSION: 2.0.2
PACMAN: C:\Users\runneradmin\AppData\Local\alire\cache\msys64\usr\bin\pacman

on:
Expand All @@ -27,7 +27,8 @@ jobs:
fail-fast: false
matrix:
os:
- macos-12
- macos-13 # amd64
- macos-latest # arm64
- ubuntu-latest
- windows-latest

Expand All @@ -51,14 +52,14 @@ jobs:
# By default, this also sets up the newest indexed native toolchain
- name: Set up stable `alr`
if: contains(github.base_ref, 'stable-')
uses: alire-project/setup-alire@v3
uses: alire-project/setup-alire@v4
with:
version: ${{env.ALR_VERSION}}

# By default, this also sets up the newest indexed native toolchain
- name: Set up devel `alr`
if: contains(github.base_ref, 'devel-')
uses: alire-project/setup-alire@v3
uses: alire-project/setup-alire@v4
with:
branch: 'master'

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

on:
pull_request:
Expand All @@ -29,7 +29,8 @@ jobs:
fail-fast: false
matrix:
os:
- macos-12
- macos-13 # amd64
- macos-latest # arm64

steps:
- name: Check out alire-index
Expand All @@ -49,7 +50,7 @@ jobs:
path: ${{env.CHECKS_REPO}}

- name: Set up stable `alr`
uses: alire-project/setup-alire@v3
uses: alire-project/setup-alire@v4
with:
version: ${{env.ALR_VERSION}}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/check-index.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
name: Check Index

env:
ALR_VERSION: 2.0.1
ALR_VERSION: 2.0.2

on: pull_request

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v4

- name: Set up stable `alr`
if: contains(github.base_ref, 'stable-')
uses: alire-project/setup-alire@v3
uses: alire-project/setup-alire@v4
with:
version: ${{env.ALR_VERSION}}

- name: Set up devel `alr`
if: contains(github.base_ref, 'devel-')
uses: alire-project/setup-alire@v3
uses: alire-project/setup-alire@v4
with:
branch: master

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/diff-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: Diff release
env:
CHECKS_ORG: alire-project
CHECKS_REPO: alire-index-checks
ALR_VERSION: 2.0.1
ALR_VERSION: 2.0.2

on:
pull_request:
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:

- name: Set up devel `alr`
if: contains(github.base_ref, 'devel-')
uses: alire-project/setup-alire@v3
uses: alire-project/setup-alire@v4
with:
toolchain: --disable-assistant # We don't need the compiler
branch: master
Expand Down
30 changes: 30 additions & 0 deletions index/ad/ada_language_server/ada_language_server-24.0.0.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
description = "An implementation of the Microsoft's Language Server Protocol for Ada"
name = "ada_language_server"
version = "24.0.0"
website = "https://github.com/AdaCore/ada_language_server"
authors = ["AdaCore"]
licenses = "GPL-3.0-only"
maintainers = ["Maxim Reznik <[email protected]>"]
maintainers-logins = ["reznikmm"]
project-files = ["gnat/lsp_server.gpr"]
tags = ["lsp", "vscode"]

[configuration]
disabled = true

[environment]
ADA_PROJECT_PATH.set= "${CRATE_ROOT}/subprojects/stubs"

[[depends-on]]
gnatcoll = "24.0.0"
libadalang = "24.0.0"
libadalang_tools = "24.0.0"
libgnatdoc = "24.0.0"
liblal_refactor = "24.0.0"
vss = "24.0.0"
spawn = "24.0.1"

[origin]
archive-name = "ada_language_server-24.0.0.tar.gz"
url = "https://github.com/AdaCore/ada_language_server/archive/refs/tags/v24.0.0.tar.gz"
hashes = ["sha512:a8b6ee7c6cf4f50589400478809a7e6a8bf12650698a7dea0880029ad882ce8ff2389c4b744b43ed31aef8cd975dc8975e77a991d9900b1842690f29fe45b714"]
90 changes: 90 additions & 0 deletions index/aw/awa/awa-2.5.0.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
description = "Ada Web Application"
name = "awa"
version = "2.5.0"
tags = ["web", "users", "jobs", "wiki", "framework", "storage", "blog"]
website = "https://gitlab.com/stcarrez/ada-awa"

licenses = "Apache-2.0"
authors = ["[email protected]"]
maintainers = ["[email protected]"]
maintainers-logins = ["stcarrez"]
long-description = """
[![Build Status](https://img.shields.io/endpoint?url=https://porion.vacs.fr/porion/api/v1/projects/ada-util/badges/build.json)](https://porion.vacs.fr/porion/projects/view/ada-util/summary)
[![Test Status](https://img.shields.io/endpoint?url=https://porion.vacs.fr/porion/api/v1/projects/ada-util/badges/tests.json)](https://porion.vacs.fr/porion/projects/view/ada-util/xunits)
[![Coverage](https://img.shields.io/endpoint?url=https://porion.vacs.fr/porion/api/v1/projects/ada-util/badges/coverage.json)](https://porion.vacs.fr/porion/projects/view/ada-util/summary)
[![Documentation Status](https://readthedocs.org/projects/ada-util/badge/?version=latest)](https://ada-util.readthedocs.io/en/latest/?badge=latest)
Ada Web Application is a framework to build a Web Application in Ada 2012.
The framework provides several ready to use and extendable modules that are common
to many web application. This includes the login, authentication, users, permissions,
managing comments, tags, votes, documents, images. It provides a complete blog,
question and answers and a wiki module.
AWA simplifies the Web Application development by taking care of user management with
Google+, Facebook authentication and by providing the foundations on top of which you
can construct your own application. AWA provides a powerful permission management
that gives flexibility to applications to grant access and protect your user's resources.
![AWA Features](https://github.com/stcarrez/ada-awa/wiki/images/awa-features.png)
# Documentation
The Ada Web Application programmer's guide describes how to setup the framework,
how you can setup and design your first web application with it,
and it provides detailed description of AWA components:
* [Ada Web Application programmer's guide](https://ada-awa.readthedocs.io/en/latest/) [PDF](https://github.com/stcarrez/ada-awa/blob/master/awa/docs/awa-book.pdf)
* [Ada Database Objects Programmer's Guide](https://ada-ado.readthedocs.io/en/latest/)
* [Ada Security Programmer's Guide](https://ada-security.readthedocs.io/en/latest/)
* [Ada Utility Library Programmer's Guide](https://ada-util.readthedocs.io/en/latest/)
"""

project-files = [
".alire/awa_blogs.gpr", ".alire/awa.gpr", ".alire/awa_settings.gpr", ".alire/awa_wikis.gpr",
".alire/awa_changelogs.gpr", ".alire/awa_images.gpr", ".alire/awa_setup.gpr", ".alire/awa_workspaces.gpr",
".alire/awa_comments.gpr", ".alire/awa_jobs.gpr", ".alire/awa_storages.gpr",
".alire/awa_counters.gpr", ".alire/awa_mail.gpr", ".alire/awa_tags.gpr",
".alire/awa_countries.gpr", ".alire/awa_questions.gpr", ".alire/awa_votes.gpr"
]

[available.'case(os)']
linux = true
freebsd = true
windows = false
macos = false
'...' = false

[[depends-on]]
utilada = "^2.6.0"
utilada_xml = "^2.6.0"
ado = "^2.4.0"
wikiada = "^1.4.1"
elada = "^1.8.6"
security = "^1.5.0"
serverfaces = "^1.6.0"
servletada = "^1.7.0"
keystoreada = "^1.4.0"
aws = "~24.0"

[[actions]]
type = "post-fetch"
command = ["sh", "./alire-setup.sh"]

[gpr-externals]
AWA_LIBRARY_TYPE = ["relocatable", "static", "static-pic"]
AWA_BUILD = ["distrib", "debug", "optimize", "profile", "coverage"]
AWA_AWS_IMPL = ["none", "1", "2", "3", "4"]

[gpr-set-externals]
AWA_AWS_IMPL = "4"

[environment]
DYNAMO_SEARCH_PATH.prepend = "${CRATE_ROOT}/awa/plugins"
DYNAMO_UML_PATH.prepend = "${CRATE_ROOT}/awa/uml"

[origin]
commit = "e34bd6db1a23d6f47214d7001b3c0ce55a7cf54f"
url = "git+https://github.com/stcarrez/ada-awa.git"

55 changes: 55 additions & 0 deletions index/aw/awa_unit/awa_unit-2.5.0.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
description = "Ada Web Application (Testing framework)"
name = "awa_unit"
version = "2.5.0"
tags = ["web", "users", "jobs", "framework", "testing"]
website = "https://gitlab.com/stcarrez/ada-awa"

licenses = "Apache-2.0"
authors = ["[email protected]"]
maintainers = ["[email protected]"]
maintainers-logins = ["stcarrez"]
long-description = """
[![Build Status](https://img.shields.io/endpoint?url=https://porion.vacs.fr/porion/api/v1/projects/ada-util/badges/build.json)](https://porion.vacs.fr/porion/projects/view/ada-util/summary)
[![Test Status](https://img.shields.io/endpoint?url=https://porion.vacs.fr/porion/api/v1/projects/ada-util/badges/tests.json)](https://porion.vacs.fr/porion/projects/view/ada-util/xunits)
[![Coverage](https://img.shields.io/endpoint?url=https://porion.vacs.fr/porion/api/v1/projects/ada-util/badges/coverage.json)](https://porion.vacs.fr/porion/projects/view/ada-util/summary)
[![Documentation Status](https://readthedocs.org/projects/ada-util/badge/?version=latest)](https://ada-util.readthedocs.io/en/latest/?badge=latest)
Ada Web Application is a framework to build a Web Application in Ada 2012.
The framework provides several ready to use and extendable modules that are common
to many web application. This includes the login, authentication, users, permissions,
managing comments, tags, votes, documents, images. It provides a complete blog,
question and answers and a wiki module.
This library provides a testing framework on top of AWA top help implementing
unit tests for AWA applications.
# Documentation
The Ada Web Application programmer's guide describes how to setup the framework,
how you can setup and design your first web application with it,
and it provides detailed description of AWA components:
* [Ada Web Application programmer's guide](https://ada-awa.readthedocs.io/en/latest/) [PDF](https://github.com/stcarrez/ada-awa/blob/master/awa/docs/awa-book.pdf)
* [Ada Database Objects Programmer's Guide](https://ada-ado.readthedocs.io/en/latest/)
* [Ada Security Programmer's Guide](https://ada-security.readthedocs.io/en/latest/)
* [Ada Utility Library Programmer's Guide](https://ada-util.readthedocs.io/en/latest/)
"""

project-files = ["awa_unit.gpr"]

[[depends-on]]
awa = "^2.5.0"
serverfaces_unit = "^1.6.0"
servletada_unit = "^1.7.0"

[gpr-externals]
AWA_LIBRARY_TYPE = ["relocatable", "static", "static-pic"]
AWA_BUILD = ["distrib", "debug", "optimize", "profile", "coverage"]

[origin]
commit = "e34bd6db1a23d6f47214d7001b3c0ce55a7cf54f"
subdir = "./.alire/unit/"
url = "git+https://github.com/stcarrez/ada-awa.git"

41 changes: 41 additions & 0 deletions index/gt/gtkada/gtkada-24.0.1.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
description = "An Ada graphical toolkit based on Gtk+"
long-description = "This crate requires Gtk3+ >= 3.24.24"
website = "https://github.com/adacore/gtkada"
name = "gtkada"
version = "24.0.1"
authors = ["AdaCore"]
licenses = "GPL-3.0-or-later WITH GCC-exception-3.1"
maintainers = ["[email protected]", "[email protected]"]
maintainers-logins = ["Fabien-Chouteau", "reznikmm"]
project-files = ["src/gtkada.gpr"]
tags = ["gtk", "gui"]

[configuration]
disabled = true

# Prepend PATH with pkg-config directory to stabilize GitHub CI
[[actions]]
type = "post-fetch"
command = ["bash", "-c", "PATH=${DISTRIB_ROOT}/mingw64/bin:${PATH} ./configure"]

# Generate gtkada-intl.adb to be able to build with gtkada.gpr
[[actions]]
type = "post-fetch"
command = ["make", "src/gtkada-intl.adb"]

[[depends-on]]
make = "*"
pkg_config = "*"
libgtk3 = ">=3.24.24"

[gpr-externals]
LIBRARY_TYPE = ["static", "static-pic", "relocatable"]

# Update PATH on Windows to help deps find .DLL files
[environment.'case(os)'.windows.PATH]
append = "${CRATE_ROOT}/src/obj/gtkada/relocatable"

[origin]
url="https://github.com/AdaCore/gtkada/archive/v24.0.1/gtkada-24.0.1.zip"
hashes=["sha512:8de57f739051f29efb64c6f1c75f7b7f46fe64b73b0f4165b6e838646dac5a868eeb20ee016129ac6088c188fa77c6777d08f1117efe152c95858fac82caf595"]

Loading

0 comments on commit b39cb68

Please sign in to comment.