Use gnat-13 as gnat-12 is not compatible with the latest gcc version

flavioc · Nov 2, 2024 · a71fe65 · a71fe65
1 parent 4b2e997
commit a71fe65
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,31 +15,30 @@ jobs:
     - run: apt-get update
     - run: apt-get install apt-transport-https ca-certificates -y
     - run: update-ca-certificates
-    - run: apt install -y gcc make autoconf g++ gnat texinfo libmpfr-dev libgmp-dev wget bzip2 git xz-utils sudo libmpc-dev zlib1g-dev bison flex gawk autopoint libtool fakeroot mount parted gettext meson
-    - run: ln -sf /usr/bin/gnatmake-12 /usr/bin/gnatmake
-    - run: ln -sf /usr/bin/gnatbind-12 /usr/bin/gnatbind
-    - run: ln -sf /usr/bin/gnatls-12 /usr/bin/gnatls
+    - run: apt install -y gcc make autoconf g++ gnat-13 texinfo libmpfr-dev libgmp-dev wget bzip2 git xz-utils sudo libmpc-dev zlib1g-dev bison flex gawk autopoint libtool fakeroot mount parted gettext meson
+    - run: ln -sf /usr/bin/gnatmake-13 /usr/bin/gnatmake
+    - run: ln -sf /usr/bin/gnatbind-13 /usr/bin/gnatbind
+    - run: ln -sf /usr/bin/gnatlink-13 /usr/bin/gnatlink
+    - run: ln -sf /usr/bin/gnatls-13 /usr/bin/gnatls
     - run: bash download.sh
     - run: bash bootstrap.sh
     - run: bash compile.sh
   full-build-x86_64:
     runs-on: self-hosted
     steps:
     - uses: actions/checkout@v2
-    - run: apt install -y gcc make autoconf g++ gnat texinfo libmpfr-dev libgmp-dev wget bzip2 git xz-utils sudo libmpc-dev zlib1g-dev bison flex gawk autopoint libtool fakeroot mount parted gettext
-    - run: ln -sf /usr/bin/gnatmake-12 /usr/bin/gnatmake
-    - run: ln -sf /usr/bin/gnatbind-12 /usr/bin/gnatbind
-    - run: ln -sf /usr/bin/gnatls-12 /usr/bin/gnatls
+    - run: apt install -y gcc make autoconf g++ gnat-13 texinfo libmpfr-dev libgmp-dev wget bzip2 git xz-utils sudo libmpc-dev zlib1g-dev bison flex gawk autopoint libtool fakeroot mount parted gettext
+    - run: ln -sf /usr/bin/gnatmake-13 /usr/bin/gnatmake
+    - run: ln -sf /usr/bin/gnatbind-13 /usr/bin/gnatbind
+    - run: ln -sf /usr/bin/gnatlink-13 /usr/bin/gnatlink
+    - run: ln -sf /usr/bin/gnatls-13 /usr/bin/gnatls
     - run: bash download.sh
     - run: CPU=x86_64 bash bootstrap.sh
     - run: CPU=x86_64 bash compile.sh
   kernel-x86_64_32:
     runs-on: self-hosted
     steps:
     - uses: actions/checkout@v2
-    - run: apt install -y gcc make autoconf g++ gnat texinfo libmpfr-dev libgmp-dev wget bzip2 git xz-utils sudo libmpc-dev zlib1g-dev bison flex gawk autopoint libtool fakeroot mount parted gettext
-    - run: ln -sf /usr/bin/gnatmake-12 /usr/bin/gnatmake
-    - run: ln -sf /usr/bin/gnatbind-12 /usr/bin/gnatbind
-    - run: ln -sf /usr/bin/gnatls-12 /usr/bin/gnatls
+    - run: apt install -y gcc make autoconf g++ texinfo libmpfr-dev libgmp-dev wget bzip2 git xz-utils sudo libmpc-dev zlib1g-dev bison flex gawk autopoint libtool fakeroot mount parted gettext
     - run: bash download.sh
     - run: USER32="true" CPU=x86_64 bash bootstrap-kernel.sh