[wip] Update to GCC 14.1.0

AmanoTeam · May 15, 2024 · 12e2725 · 12e2725
1 parent 9cd2243
commit 12e2725
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,17 @@ jobs:
     - uses: actions/checkout@main
       with:
         submodules: true
+    - name: Check for cache
+      id: check-cache
+      uses: actions/cache@main
+      with:
+        key: gcc-14.1.0
+        lookup-only: true
+        path: |
+          /tmp/x86_64-linux-gnu.tar.xz
+          /tmp/x86_64-linux-gnu.tar.xz.sha256
     - name: Build Atar
+      if: ${{ steps.check-cache.outputs.cache-hit != 'true' }}
       run: |
         bash './build.sh' 'native'
     - name: Generate tarball
@@ -22,13 +32,22 @@ jobs:
         tar --directory='/tmp' --create --file=- 'atar' | xz --threads='0' --compress -9 > "${tarball_filename}"
         sha256sum "${tarball_filename}" | sed 's|/tmp/||' > "${tarball_filename}.sha256"
     - name: Upload artifact
+      if: ${{ steps.check-cache.outputs.cache-hit != 'true' }}
       uses: actions/upload-artifact@main
       with:
         name: native-toolchain
         if-no-files-found: error
         path: |
           /tmp/x86_64-linux-gnu.tar.xz
           /tmp/x86_64-linux-gnu.tar.xz.sha256
+    - name: Cache artifact
+      if: ${{ steps.check-cache.outputs.cache-hit != 'true' }}
+      uses: actions/cache@main
+      with:
+        key: gcc-14.1.0
+        path: |
+          /tmp/x86_64-linux-gnu.tar.xz
+          /tmp/x86_64-linux-gnu.tar.xz.sha256
   
   cross-build:
     name: 'Cross build'
@@ -56,13 +75,17 @@ jobs:
     - uses: actions/checkout@main
       with:
         submodules: true
-    - name: Download artifact
-      uses: actions/download-artifact@main
+    - name: Restore from cache
+      uses: actions/cache@main
       with:
-        name: native-toolchain
+        key: gcc-14.1.0
+        fail-on-cache-miss: true
+        path: |
+          /tmp/x86_64-linux-gnu.tar.xz
+          /tmp/x86_64-linux-gnu.tar.xz.sha256
     - name: Setup toolchain
       run: |
-        tar --directory='/tmp' --extract --file='./x86_64-linux-gnu.tar.xz'
+        tar --directory='/tmp' --extract --file='/tmp/x86_64-linux-gnu.tar.xz'
         mv '/tmp/atar' '/tmp/atar-toolchain'
     - name: Build Atar with OBGGCC
       run: |
@@ -78,7 +101,7 @@ jobs:
     - name: Upload artifact
       uses: actions/upload-artifact@main
       with:
-        name: cross-toolchain
+        name: ${{ matrix.target }}
         if-no-files-found: error
         path: |
           /tmp/${{ matrix.target }}.tar.xz

diff --git a/build.sh b/build.sh
@@ -54,7 +54,7 @@ if ! [ -f "${gmp_tarball}" ]; then
 fi
 
 if ! [ -f "${mpfr_tarball}" ]; then
-	wget --no-verbose 'https://ftp.gnu.org/gnu/mpfr/mpfr-4.2.0.tar.xz' --output-document="${mpfr_tarball}"
+	wget --no-verbose 'https://ftp.gnu.org/gnu/mpfr/mpfr-4.2.1.tar.xz' --output-document="${mpfr_tarball}"
 	tar --directory="$(dirname "${mpfr_directory}")" --extract --file="${mpfr_tarball}"
 fi