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.

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

GCC 13.1 and dependencies update #49

Merged
merged 22 commits into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
93e2b87
GCC 13.1 and dependencies update
Fabien-Chouteau Apr 28, 2023
9e446e4
Remove sanity checking runs
Fabien-Chouteau May 30, 2023
e4c7bd4
.github/workflows/linux.yml: explicitly request bison install
Fabien-Chouteau May 30, 2023
d00647d
Upgrade GitHub CI runners for Linux and macOS
Fabien-Chouteau May 31, 2023
d325ccc
Update embedded-runtimes
Fabien-Chouteau Jun 2, 2023
d6df20b
Update MINGW to 11.0.0
Fabien-Chouteau Jun 7, 2023
1ab76b8
Update spark2014 and dependencies
Fabien-Chouteau Jun 9, 2023
324cb08
Fix Ocaml setup and Linux and macOS
Fabien-Chouteau Jun 9, 2023
71e596b
GitHub CI: change alt-ergo build script and branch
Fabien-Chouteau Jun 13, 2023
bae77c7
Change ocaml version and source branch for why3 builds
Fabien-Chouteau Jun 19, 2023
98a01c4
gcc: fix build on Windows
Fabien-Chouteau Jun 21, 2023
02b5f4c
Merge branch 'gnat-fsf-13' of https://github.com/alire-project/GNAT-F…
Fabien-Chouteau Jun 21, 2023
5029488
Fix GDB builds on windows
Fabien-Chouteau Aug 2, 2023
d3fe0b9
Use fsf-13 branches of spark2014 and why3
Fabien-Chouteau Jun 27, 2023
0d704ae
Log commit id for Ocaml projects and use newer Ocaml setup action
Fabien-Chouteau Jun 28, 2023
7e182ba
Specify the number of jobs for make commands
Fabien-Chouteau Sep 29, 2023
5336cda
gcc.anod: remove macOS specific compiler flag
Fabien-Chouteau Oct 5, 2023
73753fe
.github/workflows/macos.yml: move to macos-12 and remove sanity check
Fabien-Chouteau Oct 5, 2023
dea7125
.github/workflows/windows.yml: remove sanity check
Fabien-Chouteau Oct 5, 2023
aa9b481
specs/binutils.anod: explicitely disable zstd
Fabien-Chouteau Oct 6, 2023
470f312
GCC 13.2
Fabien-Chouteau Oct 16, 2023
674d28a
Improve alt-ergo CI steps
Fabien-Chouteau Oct 16, 2023
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
94 changes: 24 additions & 70 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
gnat_gprbuild:
name: GNAT Linux and GPRbuild
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout Project
uses: actions/checkout@v2
Expand All @@ -25,7 +25,7 @@ jobs:
pip install e3-core==22.1.0

- name: Install Ada dependencies
run: sudo apt-get install gnat
run: sudo apt-get install gnat bison

- name: Build GNAT native
run: ./anod build gcc -v --loglevel DEBUG --enable-cleanup
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
gnatcov:
name: GNATcov
needs: gnat_gprbuild
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout Project
uses: actions/checkout@v2
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
target: ["arm-elf", "riscv64-elf", "avr-elf"]
name: GNAT ${{ matrix.target }}-linux
needs: gnat_gprbuild
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout Project
uses: actions/checkout@v2
Expand Down Expand Up @@ -147,17 +147,18 @@ jobs:
strategy:
matrix:
ocaml-version:
- 4.12.0
runs-on: ubuntu-18.04
- 4.11.2

runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
repository: 'adacore/why3'
ref: 'fsf-12'
ref: 'fsf-13'

- name: Use Setup OCaml v2 ${{ matrix.ocaml-version }}
uses: avsm/setup-ocaml@v2
- name: Use Setup OCaml {{ matrix.ocaml-version }}
uses: ocaml/setup-ocaml@v1.1.11
with:
ocaml-version: ${{ matrix.ocaml-version }}

Expand All @@ -170,6 +171,8 @@ jobs:
- run: opam exec -- make
- run: opam exec -- make install_spark2014

- run: git log --format="%H" -n 1 > /tmp/why3install/why3-version.txt

- name: Upload the build artifact
uses: actions/upload-artifact@v2
with:
Expand All @@ -178,38 +181,26 @@ jobs:


alt_ergo:
runs-on: ubuntu-18.04
env:
OPAMYES: true
OCAML_DEFAULT_VERSION: 4.10.0
strategy:
matrix:
ocaml-compiler:
- "4.11.2"
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
repository: 'adacore/alt-ergo'
ref: 'fsf-12'
ref: 'master'

- name: Use Setup OCaml v2 ${{ matrix.ocaml-version }}
uses: avsm/setup-ocaml@v2
- name: Use Setup OCaml {{ matrix.ocaml-version }}
uses: ocaml/setup-ocaml@v2
with:
ocaml-version: ${{ env.OCAML_DEFAULT_VERSION }}
ocaml-compiler: ${{ matrix.ocaml-compiler }}

- name: opam install depext
run: opam depext alt-ergo-lib alt-ergo-parsers alt-ergo
- run: opam install alt-ergo --destdir=/tmp/alt-ergo-install

- run: opam install camlzip cmdliner dune dune-configurator menhir num ocamlgraph ocplib-simplex psmt2-frontend re seq yojson zarith

- run: opam exec -- ocaml unix.cma configure.ml alt-ergo-lib
- run: opam exec -- make alt-ergo-lib
- run: opam exec -- make install-lib

- run: opam exec -- ocaml unix.cma configure.ml alt-ergo-parsers
- run: opam exec -- make alt-ergo-parsers
- run: opam exec -- make install-parsers

- run: opam exec -- ocaml unix.cma configure.ml alt-ergo --prefix=/tmp/alt-ergo-install
- run: opam exec -- make alt-ergo
- run: opam exec -- make install-bin
- run: git log --format="%H" -n 1 > /tmp/alt-ergo-install/alt-ergo-version.txt

- name: Upload the build artifact
uses: actions/upload-artifact@v2
Expand All @@ -221,7 +212,7 @@ jobs:
spark:
name: spark
needs: [gnat_gprbuild, why3, alt_ergo]
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout Project
uses: actions/checkout@v2
Expand Down Expand Up @@ -264,40 +255,3 @@ jobs:
name: release-packages
path: sbx/*/release_package*/install/*
retention-days: 5



sanity_checking:
name: Sanity Checking
needs: [gnat_gprbuild, gnatcov, spark]
runs-on: ubuntu-18.04
steps:
- name: Checkout Project
uses: actions/checkout@v2

- 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-testsuite

- uses: actions/download-artifact@v2
with:
name: release-packages
path: ./sanity-checking/release_packages

- name: Run testsuite
run: |
cd ./sanity-checking
python3 ./run.py -v --install-deps-from=release_packages --pkgs-install-dir=pkgs_install --failure-exit-code 1

- uses: actions/upload-artifact@v2
if: failure()
with:
name: testsuite-results-${{runner.os}}
path: sanity-checking/out/new
retention-days: 5
93 changes: 23 additions & 70 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
gnat_gprbuild:
name: GNAT macOS and GPRbuild
runs-on: macos-10.15
runs-on: macos-12
steps:
- name: Checkout Project
uses: actions/checkout@v2
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
gnatcov:
name: GNATcov
needs: gnat_gprbuild
runs-on: macos-10.15
runs-on: macos-12
steps:
- name: Checkout Project
uses: actions/checkout@v2
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
target: ["arm-elf", "riscv64-elf", "avr-elf"]
name: GNAT ${{ matrix.target }}-darwin
needs: gnat_gprbuild
runs-on: macos-10.15
runs-on: macos-12
steps:
- name: Checkout Project
uses: actions/checkout@v2
Expand Down Expand Up @@ -144,17 +144,17 @@ jobs:
strategy:
matrix:
ocaml-version:
- 4.12.0
runs-on: macos-10.15
- 4.11.2
runs-on: macos-12
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
repository: 'adacore/why3'
ref: 'fsf-12'
ref: 'fsf-13'

- name: Use Setup OCaml v2 ${{ matrix.ocaml-version }}
uses: avsm/setup-ocaml@v2
- name: Use Setup OCaml {{ matrix.ocaml-version }}
uses: ocaml/setup-ocaml@v1.1.11
with:
ocaml-version: ${{ matrix.ocaml-version }}

Expand All @@ -167,6 +167,8 @@ jobs:
- run: opam exec -- make
- run: opam exec -- make install_spark2014

- run: git log --format="%H" -n 1 > /tmp/why3install/why3-version.txt

- name: Upload the build artifact
uses: actions/upload-artifact@v2
with:
Expand All @@ -175,38 +177,27 @@ jobs:


alt_ergo:
env:
OPAMYES: true
OCAML_DEFAULT_VERSION: 4.10.0
runs-on: macos-10.15
strategy:
matrix:
ocaml-compiler:
- "4.11.2"

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

- name: Use Setup OCaml v2 ${{ matrix.ocaml-version }}
uses: avsm/setup-ocaml@v2
- name: Use Setup OCaml {{ matrix.ocaml-version }}
uses: ocaml/setup-ocaml@v2
with:
ocaml-version: ${{ env.OCAML_DEFAULT_VERSION }}
ocaml-compiler: ${{ matrix.ocaml-compiler }}

- name: opam install depext
run: opam depext alt-ergo-lib alt-ergo-parsers alt-ergo
- run: opam install alt-ergo --destdir=/tmp/alt-ergo-install

- run: opam install camlzip cmdliner dune dune-configurator menhir num ocamlgraph ocplib-simplex psmt2-frontend re seq yojson zarith

- run: opam exec -- ocaml unix.cma configure.ml alt-ergo-lib
- run: opam exec -- make alt-ergo-lib
- run: opam exec -- make install-lib

- run: opam exec -- ocaml unix.cma configure.ml alt-ergo-parsers
- run: opam exec -- make alt-ergo-parsers
- run: opam exec -- make install-parsers

- run: opam exec -- ocaml unix.cma configure.ml alt-ergo --prefix=/tmp/alt-ergo-install
- run: opam exec -- make alt-ergo
- run: opam exec -- make install-bin
- run: git log --format="%H" -n 1 > /tmp/alt-ergo-install/alt-ergo-version.txt

- name: Upload the build artifact
uses: actions/upload-artifact@v2
Expand All @@ -219,7 +210,7 @@ jobs:
spark:
name: SPARK
needs: [gnat_gprbuild, why3, alt_ergo]
runs-on: macos-10.15
runs-on: macos-12
steps:
- name: Checkout Project
uses: actions/checkout@v2
Expand Down Expand Up @@ -262,41 +253,3 @@ jobs:
name: release-packages
path: sbx/*/release_package*/install/*
retention-days: 5




sanity_checking:
name: Sanity Checking
needs: [gnat_gprbuild, gnatcov, spark]
runs-on: macos-10.15
steps:
- name: Checkout Project
uses: actions/checkout@v2

- 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-testsuite

- uses: actions/download-artifact@v2
with:
name: release-packages
path: ./sanity-checking/release_packages

- name: Run testsuite
run: |
cd ./sanity-checking
python3 ./run.py -v --install-deps-from=release_packages --pkgs-install-dir=pkgs_install --failure-exit-code 1

- uses: actions/upload-artifact@v2
if: failure()
with:
name: testsuite-results-${{runner.os}}
path: sanity-checking/out/new
retention-days: 5
53 changes: 0 additions & 53 deletions .github/workflows/sanity-checking.yml

This file was deleted.

Loading
Loading