Skip to content

Commit

Permalink
Try running Linux builds on WarpBuild
Browse files Browse the repository at this point in the history
  • Loading branch information
yrashk committed Jun 14, 2024
1 parent 7da1df3 commit 85d3c49
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 19 deletions.
50 changes: 32 additions & 18 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,23 @@ on:
# - cron: '0 0 * * *'
#push:
pull_request:
workflow_dispatch:


jobs:
gnat_gprbuild:
strategy:
fail-fast: false
matrix:
runner: [warp-ubuntu-latest-x64-16x, warp-ubuntu-latest-arm64-16x]
runs-on: ${{ matrix.runner }}
name: GNAT Linux and GPRbuild
runs-on: ubuntu-20.04
steps:
- name: Checkout Project
uses: actions/checkout@v2

- name: Set up Python
uses: actions/setup-python@v2
uses: deadsnakes/[email protected]
with:
python-version: 3.8

Expand All @@ -25,7 +30,7 @@ jobs:
pip install e3-core==22.1.0
- name: Install Ada dependencies
run: sudo apt-get install gnat bison
run: sudo apt-get install -y gnat bison

- name: Build GNAT native
run: ./anod build gcc -v --loglevel DEBUG --enable-cleanup
Expand Down Expand Up @@ -63,7 +68,10 @@ jobs:
gnatcov:
name: GNATcov
needs: gnat_gprbuild
runs-on: ubuntu-20.04
strategy:
matrix:
runner: [warp-ubuntu-latest-x64-16x, warp-ubuntu-latest-arm64-16x]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout Project
uses: actions/checkout@v2
Expand All @@ -74,7 +82,7 @@ jobs:
path: in_artifacts/

- name: Set up Python
uses: actions/setup-python@v2
uses: deadsnakes/[email protected]
with:
python-version: 3.8

Expand All @@ -100,12 +108,13 @@ jobs:


gnat_cross:
needs: gnat_gprbuild
strategy:
matrix:
target: ["arm-elf", "riscv64-elf", "avr-elf"]
runner: [warp-ubuntu-latest-x64-16x, warp-ubuntu-latest-arm64-16x]
name: GNAT ${{ matrix.target }}-linux
needs: gnat_gprbuild
runs-on: ubuntu-20.04
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout Project
uses: actions/checkout@v2
Expand All @@ -116,7 +125,7 @@ jobs:
path: in_artifacts/

- name: Set up Python
uses: actions/setup-python@v2
uses: deadsnakes/[email protected]
with:
python-version: 3.8

Expand Down Expand Up @@ -148,8 +157,8 @@ jobs:
matrix:
ocaml-compiler:
- 4.11.2

runs-on: ubuntu-20.04
runner: [warp-ubuntu-latest-x64-16x, warp-ubuntu-latest-arm64-16x]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down Expand Up @@ -178,16 +187,18 @@ jobs:
- name: Upload the build artifact
uses: actions/upload-artifact@v2
with:
name: why3
name: why3-${{ matrix.runner }}
path: /tmp/why3install


alt_ergo:
strategy:
matrix:
ocaml-compiler:
- "4.11.2"
runs-on: ubuntu-20.04
- 4.11.2
runner: [warp-ubuntu-latest-x64-16x, warp-ubuntu-latest-arm64-16x]
runs-on: ${{ matrix.runner }}

steps:
- name: Checkout code
uses: actions/checkout@v2
Expand All @@ -207,30 +218,33 @@ jobs:
- name: Upload the build artifact
uses: actions/upload-artifact@v2
with:
name: alt-ergo
name: alt-ergo-${{ matrix.runner }}
path: /tmp/alt-ergo-install


spark:
name: spark
needs: [why3, alt_ergo]
runs-on: ubuntu-20.04
strategy:
matrix:
runner: [warp-ubuntu-latest-x64-16x, warp-ubuntu-latest-arm64-16x]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout Project
uses: actions/checkout@v2

- uses: actions/download-artifact@v2
with:
name: alt-ergo
name: alt-ergo-${{ matrix.runner }}
path: alt-ergo_artifact/

- uses: actions/download-artifact@v2
with:
name: why3
name: why3-${{ matrix.runner }}
path: why3_artifact/

- name: Set up Python
uses: actions/setup-python@v2
uses: deadsnakes/[email protected]
with:
python-version: 3.8

Expand Down
2 changes: 2 additions & 0 deletions lib/platform_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ def update_db(self) -> None:

}
)

self.host_guess.update({"aarch64-linux": {"os": "Linux", "cpu": "aarch64"}})
2 changes: 1 addition & 1 deletion specs/gcc.anod
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class GCC(spec("gh-artifact")):
url=(
"https://ftp.gnu.org/gnu/gcc/gcc-%s/%s"
% (self.version, self.tarball)
if self.env.target.cpu.name == "x86_64"
if self.env.target.cpu.name == "x86_64" or self.env.target.cpu.name == "aarch64"
else
"https://github.com/iains/gcc-14-branch/archive/refs/"
+ "tags/gcc-14.1-darwin-r0.tar.gz"
Expand Down

0 comments on commit 85d3c49

Please sign in to comment.