Roll back temporary changes to CI actions (#256)
This commit is contained in:
committed by
GitHub
parent
c0e589f834
commit
220cdea28b
@@ -71,22 +71,14 @@ jobs:
|
||||
with:
|
||||
distrib: community
|
||||
|
||||
# begin TEMPORARY WORKAROUND (until 1.0 is release)
|
||||
|
||||
# The problem is the index is already named stable, yet the test should be
|
||||
# performed using master, as the stable installer still uses the beta. After
|
||||
# the release we simply need to uncomment the following lines.
|
||||
|
||||
# - name: Set up stable `alr`
|
||||
# if: contains(github.base_ref, 'stable-')
|
||||
# uses: alire-project/setup-alire@latest-stable
|
||||
- name: Set up stable `alr`
|
||||
if: contains(github.base_ref, 'stable-')
|
||||
uses: alire-project/setup-alire@latest-stable
|
||||
|
||||
- name: Set up devel `alr`
|
||||
# if: contains(github.base_ref, 'devel-')
|
||||
if: contains(github.base_ref, 'devel-')
|
||||
uses: alire-project/setup-alire@latest-devel
|
||||
|
||||
# end Workaround;
|
||||
|
||||
- name: Test crate (Linux)
|
||||
if: matrix.os == 'ubuntu-latest' # docker testing only for linuxes
|
||||
uses: mosteo/actions@docker-run/v1
|
||||
|
||||
@@ -10,25 +10,20 @@ jobs:
|
||||
with:
|
||||
repo-token: "${{ secrets.GITHUB_TOKEN }}"
|
||||
|
||||
# begin temporary workaround until 1.0 release
|
||||
# We need to test with the latest rc candidate
|
||||
|
||||
# - name: Set up stable `alr`
|
||||
# if: contains(github.base_ref, 'stable-')
|
||||
# uses: alire-project/setup-alire@latest-stable
|
||||
- name: Set up stable `alr`
|
||||
if: contains(github.base_ref, 'stable-')
|
||||
uses: alire-project/setup-alire@latest-stable
|
||||
|
||||
- name: Set up GNAT for devel `alr`
|
||||
# if: contains(github.base_ref, 'devel-')
|
||||
if: contains(github.base_ref, 'devel-')
|
||||
uses: ada-actions/toolchain@ce2020
|
||||
with:
|
||||
distrib: fsf
|
||||
|
||||
- name: Set up devel `alr`
|
||||
# if: contains(github.base_ref, 'devel-')
|
||||
if: contains(github.base_ref, 'devel-')
|
||||
uses: alire-project/setup-alire@latest-devel
|
||||
|
||||
# end temporary workaround
|
||||
|
||||
- run: alr index --list
|
||||
|
||||
- run: alr index --add=. --name=local_index
|
||||
|
||||
Reference in New Issue
Block a user