Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GNATprove 14.1 #66

Merged
merged 19 commits into from
Aug 1, 2024
Merged

GNATprove 14.1 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
195ae49
GNATprove 14.1
Fabien-Chouteau May 30, 2024
24b3fb9
TBM
Fabien-Chouteau May 30, 2024
bbf5e6c
GNATprove: add libiconv dependency on Windows
Fabien-Chouteau May 31, 2024
306ca47
spark2014: set sparklib commit id
Fabien-Chouteau May 31, 2024
39805b7
libgpr2: fix SOURCE_DIR for macOS
Fabien-Chouteau May 31, 2024
90a24ab
spark2014: use glibc 2.31 version of Z3
Fabien-Chouteau Jun 3, 2024
623e0f9
GDB: disable python support on all GDB
Fabien-Chouteau Jun 3, 2024
8bc3d7c
spark2014: use static builds for libgmp and libiconv
Fabien-Chouteau Jun 4, 2024
48821a2
embedded-runtimes: bump branch commit to include new fix
Fabien-Chouteau Jun 5, 2024
557643c
utils/gen_gnat_manifests.py: set library paths for native compilers
Fabien-Chouteau Jun 7, 2024
053e398
gnatcoll-bindings: only build static libs
Fabien-Chouteau Jun 7, 2024
0af8648
specs/gnu.anod: on Linux create a duplicate lib64/ along the lib/
Fabien-Chouteau Jun 7, 2024
a001205
Build GCC 14.1 on aarch64-apple-darwin.
simonjwright Jun 9, 2024
c3910be
Enable GNAT cross builds on macos arm
Fabien-Chouteau Jun 21, 2024
d481940
why3, alt-ergo on macOS aarch64: fix branches for 14 release
Fabien-Chouteau Jun 21, 2024
e143589
gcc: select macOS aarch64 fork based on host arch rather than target
Fabien-Chouteau Jun 21, 2024
efd833a
spark2014: bring back shared libgmp for alt-ergo
Fabien-Chouteau Jul 4, 2024
0cb0eb4
Update libadalang to 24.0
Fabien-Chouteau Jul 5, 2024
1443b47
spark2014: shared gmp should not be in the environment for builds
Fabien-Chouteau Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:


jobs:
gnat_gprbuild:
name: GNAT Linux and GPRbuild
gnat:
name: GNAT Linux
runs-on: ubuntu-20.04
steps:
- name: Checkout Project
Expand Down Expand Up @@ -38,14 +38,6 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool

- name: Build GPRbuild
run: ./anod build gprbuild -v --loglevel DEBUG --enable-cleanup

- name: Package GPRbuild
run: ./anod build release_package --qualifier=package=gprbuild,do_gh_release -v --loglevel DEBUG
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool

- uses: actions/upload-artifact@v2
with:
name: anod-artifacts
Expand All @@ -60,19 +52,13 @@ jobs:



gnatcov:
name: GNATcov
needs: gnat_gprbuild
gprbuild_gnatcov:
name: GPRbuild and GNATcov
runs-on: ubuntu-20.04
steps:
- name: Checkout Project
uses: actions/checkout@v2

- uses: actions/download-artifact@v2
with:
name: anod-artifacts
path: in_artifacts/

- name: Set up Python
uses: actions/setup-python@v2
with:
Expand All @@ -83,6 +69,14 @@ jobs:
python -m pip install --upgrade pip
pip install e3-core==22.1.0
- name: Build GPRbuild
run: ./anod build gprbuild -v --loglevel DEBUG --enable-cleanup

- name: Package GPRbuild
run: ./anod build release_package --qualifier=package=gprbuild,do_gh_release -v --loglevel DEBUG
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool

- name: Build GNATcov
run: ./anod build gnatcov -v --loglevel DEBUG --enable-cleanup

Expand All @@ -104,7 +98,7 @@ jobs:
matrix:
target: ["arm-elf", "riscv64-elf", "avr-elf"]
name: GNAT ${{ matrix.target }}-linux
needs: gnat_gprbuild
needs: gnat
runs-on: ubuntu-20.04
steps:
- name: Checkout Project
Expand Down Expand Up @@ -155,7 +149,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: 'adacore/why3'
ref: 'fsf-13'
ref: 'fsf-14'

- name: Use Setup OCaml {{ matrix.ocaml-version }}
uses: ocaml/setup-ocaml@v2
Expand Down Expand Up @@ -193,7 +187,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: 'adacore/alt-ergo'
ref: 'master'
ref: 'fsf-14'

- name: Use Setup OCaml {{ matrix.ocaml-version }}
uses: ocaml/setup-ocaml@v2
Expand Down
38 changes: 16 additions & 22 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:


jobs:
gnat_gprbuild:
name: GNAT macOS and GPRbuild
gnat:
name: GNAT macOS
runs-on: macos-12
steps:
- name: Checkout Project
Expand All @@ -35,14 +35,6 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool

- name: Build GPRbuild
run: ./anod build gprbuild -v --loglevel DEBUG --enable-cleanup

- name: Package GPRbuild
run: ./anod build release_package --qualifier=package=gprbuild,do_gh_release -v --loglevel DEBUG
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool

- uses: actions/upload-artifact@v2
with:
name: anod-artifacts
Expand All @@ -56,20 +48,13 @@ jobs:
retention-days: 5



gnatcov:
name: GNATcov
needs: gnat_gprbuild
gprbuild_gnatcov:
name: GPRbuild and GNATcov
runs-on: macos-12
steps:
- name: Checkout Project
uses: actions/checkout@v2

- uses: actions/download-artifact@v2
with:
name: anod-artifacts
path: in_artifacts/

- name: Set up Python
uses: actions/setup-python@v2
with:
Expand All @@ -80,6 +65,15 @@ jobs:
python -m pip install --upgrade pip
pip install e3-core==22.1.0
- name: Build GPRbuild
run: ./anod build gprbuild -v --loglevel DEBUG --enable-cleanup

- name: Package GPRbuild
run: ./anod build release_package --qualifier=package=gprbuild,do_gh_release -v --loglevel DEBUG
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool


- name: Build GNATcov
run: ./anod build gnatcov -v --loglevel DEBUG --enable-cleanup

Expand All @@ -101,7 +95,7 @@ jobs:
matrix:
target: ["arm-elf", "riscv64-elf", "avr-elf"]
name: GNAT ${{ matrix.target }}-darwin
needs: gnat_gprbuild
needs: gnat
runs-on: macos-12
steps:
- name: Checkout Project
Expand Down Expand Up @@ -151,7 +145,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: 'adacore/why3'
ref: 'fsf-13'
ref: 'fsf-14'

- name: Use Setup OCaml {{ matrix.ocaml-version }}
uses: ocaml/setup-ocaml@v2
Expand Down Expand Up @@ -190,7 +184,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: 'adacore/alt-ergo'
ref: 'master'
ref: 'fsf-14'

- name: Use Setup OCaml {{ matrix.ocaml-version }}
uses: ocaml/setup-ocaml@v2
Expand Down
69 changes: 56 additions & 13 deletions .github/workflows/macos_arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ on:
workflow_dispatch:

jobs:
gnat_gprbuild:
gnat:
name: GNAT macOS
runs-on: macos-14
steps:
- name: Set Xcode 15.3
run: sudo xcode-select --switch /Applications/Xcode_15.3.app

- name: Checkout Project
uses: actions/checkout@v2

Expand Down Expand Up @@ -35,14 +38,6 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool

- name: Build GPRbuild
run: ./anod build gprbuild -v --loglevel DEBUG --enable-cleanup

- name: Package GPRbuild
run: ./anod build release_package --qualifier=package=gprbuild,do_gh_release -v --loglevel DEBUG
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool

- uses: actions/upload-artifact@v2
with:
name: anod-artifacts
Expand All @@ -55,20 +50,65 @@ jobs:
path: sbx/*/release_package*/install/*
retention-days: 5

gnat_cross:
strategy:
matrix:
target: ["arm-elf", "riscv64-elf", "avr-elf"]
name: GNAT ${{ matrix.target }}-darwin
needs: gnat
runs-on: macos-14
steps:
- name: Set Xcode 15.3
run: sudo xcode-select --switch /Applications/Xcode_15.3.app

- name: Checkout Project
uses: actions/checkout@v2

- uses: actions/download-artifact@v2
with:
name: anod-artifacts
path: in_artifacts/

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8

- name: Install Python dependencies
run: |
python -m pip install --upgrade pip
pip install e3-core==22.1.0

- name: Build GNAT ${{ matrix.target }}
run: ./anod build gcc -v --loglevel DEBUG --target=${{ matrix.target }} --enable-cleanup

- name: Build GDB ${{ matrix.target }}
run: ./anod build gdb -v --loglevel DEBUG --target=${{ matrix.target }} --enable-cleanup

- name: Package GNAT ${{ matrix.target }}
run: ./anod build release_package --qualifier=package=gnat,do_gh_release --target=${{ matrix.target }} -v --loglevel DEBUG
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool

- uses: actions/upload-artifact@v2
with:
name: release-packages
path: sbx/*/release_package*/install/*
retention-days: 5


why3:
strategy:
matrix:
ocaml-compiler:
- 4.12.1
- 4.11.2
runs-on: macos-14
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
repository: 'adacore/why3'
ref: 'fsf-13'
ref: 'fsf-14'

- name: Use Setup OCaml {{ matrix.ocaml-version }}
uses: ocaml/setup-ocaml@v2
Expand Down Expand Up @@ -99,15 +139,15 @@ jobs:
strategy:
matrix:
ocaml-compiler:
- 4.12.1
- "4.11.2"

runs-on: macos-14
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
repository: 'adacore/alt-ergo'
ref: 'master'
ref: 'fsf-14'

- name: Use Setup OCaml {{ matrix.ocaml-version }}
uses: ocaml/setup-ocaml@v2
Expand All @@ -134,6 +174,9 @@ jobs:
- name: Checkout Project
uses: actions/checkout@v2

- name: Set Xcode 15.3
run: sudo xcode-select --switch /Applications/Xcode_15.3.app

- uses: actions/download-artifact@v2
with:
name: alt-ergo
Expand Down
35 changes: 15 additions & 20 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ on:
pull_request:

jobs:
gnat_gprbuild:
name: GNAT Windows and gprbuild
gnat:
name: GNAT Windows
runs-on: windows-2019
env:
CONFIG_SHELL: /bin/bash
Expand Down Expand Up @@ -49,14 +49,6 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool

- name: Build GPRbuild
run: mount C:/aaa /aaa && cd /aaa/GNAT-FSF-builds && python3 ./anod build gprbuild -v --loglevel DEBUG --enable-cleanup

- name: Package GPRbuild
run: mount C:/aaa /aaa && cd /aaa/GNAT-FSF-builds && python3 ./anod build release_package --qualifier=package=gprbuild,do_gh_release -v --loglevel DEBUG
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool

- uses: actions/upload-artifact@v2
with:
name: anod-artifacts
Expand All @@ -71,9 +63,8 @@ jobs:



gnatcov:
name: GNATcov
needs: gnat_gprbuild
gprbuild_gnatcov:
name: GPRbuild and GNATcov
runs-on: windows-2019
env:
CONFIG_SHELL: /bin/bash
Expand Down Expand Up @@ -104,10 +95,14 @@ jobs:
# We need a path that is compatible between Windows and Unix world
run: df -h; mkdir /c/aaa; mount C:/aaa /aaa ; cd ..; cp -r GNAT-FSF-builds /c/aaa

- uses: actions/download-artifact@v2
with:
name: anod-artifacts
path: C:/aaa/GNAT-FSF-builds/in_artifacts/

- name: Build GPRbuild
run: mount C:/aaa /aaa && cd /aaa/GNAT-FSF-builds && python3 ./anod build gprbuild -v --loglevel DEBUG --enable-cleanup

- name: Package GPRbuild
run: mount C:/aaa /aaa && cd /aaa/GNAT-FSF-builds && python3 ./anod build release_package --qualifier=package=gprbuild,do_gh_release -v --loglevel DEBUG
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # for GitHub CLI tool


- name: Build GNATcov
Expand All @@ -134,7 +129,7 @@ jobs:
matrix:
target: ["arm-elf", "riscv64-elf", "avr-elf"]
name: GNAT ${{ matrix.target }}-windows
needs: gnat_gprbuild
needs: gnat
runs-on: windows-2019
env:
CONFIG_SHELL: /bin/bash
Expand Down Expand Up @@ -200,7 +195,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: 'adacore/why3'
ref: 'fsf-13'
ref: 'fsf-14'

- name: Use Setup OCaml v1 ${{ matrix.ocaml-version }}
uses: ocaml/setup-ocaml@v2
Expand Down Expand Up @@ -238,7 +233,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: 'adacore/alt-ergo'
ref: 'master'
ref: 'fsf-14'

- name: Use Setup OCaml {{ matrix.ocaml-version }}
uses: ocaml/setup-ocaml@v2
Expand Down
Loading
Loading