Skip to content

Commit

Permalink
Merge remote-tracking branch 'alire/stable-1.3.0' into topic/gnat_dar…
Browse files Browse the repository at this point in the history
…win_m1
  • Loading branch information
mosteo committed Mar 15, 2024
2 parents 176b393 + 2fd0dc1 commit 71747f8
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-native-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ name: Build Crate (alr dev)
env:
CHECKS_ORG: alire-project
CHECKS_REPO: alire-index-checks
PACMAN: C:\Users\runneradmin\AppData\Local\alire\cache\msys64\usr\bin\pacman

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

- name: Install tar from msys2 (Windows) # Git tar in Actions VM does not seem to work)
if: matrix.os == 'windows-latest'
run: C:\Users\runneradmin\AppData\Local\alire\cache\msys64\usr\bin\pacman --noconfirm -S tar
run: ${{env.PACMAN}} --noconfirm -S tar

- name: Test crate
run: ${{env.CHECKS_REPO}}/scripts/gh-build-crate.sh
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/build-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ env:
CHECKS_ORG: alire-project
CHECKS_REPO: alire-index-checks
ALR_VERSION: 2.0.0
PACMAN: C:\Users\runneradmin\AppData\Local\alire\cache\msys64\usr\bin\pacman

on:
pull_request:
Expand Down Expand Up @@ -48,20 +49,20 @@ 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@v2
uses: alire-project/setup-alire@v3
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@v2
uses: alire-project/setup-alire@v3
with:
branch: 'master'

- name: Install tar from msys2 (Windows) # Git tar in Actions VM does not seem to work)
if: matrix.os == 'windows-latest'
run: C:\Users\runneradmin\.cache\alire\msys64\usr\bin\pacman --noconfirm -S tar
run: ${{env.PACMAN}} --noconfirm -S tar

- name: Test crate
run: ${{env.CHECKS_REPO}}/scripts/gh-build-crate.sh
Expand Down
55 changes: 55 additions & 0 deletions index/al/alr2appimage/alr2appimage-0.9.2.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name = "alr2appimage"
description = "Tool to create an AppImage executable from an Alire crate"
version = "0.9.2"
website = "https://github.com/mgrojo/alr2appimage"
long-description = """
There are two prerequisites for your project to work with this tool:
- It has to be a crate with an `executables` field. Its first value
has to be the main application program.
- It must be installable using Alire, including all the needed resources.
`alr2appimage` will use the following command for installing it (this requires Alire 2.0):
```shell
alr install
```
Or it will run `gprinstall` inside `alr exec`, if the former fails (Alire 1.x).
If you simply run the tool inside an Alire crate, it will read the
metadata from your `alire.toml` file and create a default AppImage
from it.
NOTE: `alr2appimage` is an independent project; it is not
affiliated to, nor supported by, the Alire or AppImage projects.
"""
licenses = "GPL-3.0-only"

tags = ["utility", "appimage", "alire", "linux", "packaging"]

authors = ["Manuel Gomez"]
maintainers = ["Manuel Gomez <[email protected]>"]
maintainers-logins = ["mgrojo"]

executables = ["alr2appimage"]
[[depends-on]]
ada_toml = "^0.3.0"

[[depends-on]]
spoon = "^1.0.1"

[[depends-on]]
parse_args = "~0.9.0"

[[depends-on]]
resources = "~0.1.0"

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

[build-switches]
"*".style_checks = ["-gnaty3abBCrfklM99nptx"]
[origin]
commit = "71ae65731924e10a675590c2ccec774640820786"
url = "git+https://github.com/mgrojo/alr2appimage.git"

0 comments on commit 71747f8

Please sign in to comment.