Skip to content

Commit b5bc832

Browse files
authored
Merge pull request rust-lang#601 from rust-lang/update-gcc-2025-01-15
Update GCC version
2 parents 7bc6701 + 0ab1f8d commit b5bc832

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ env:
1313

1414
jobs:
1515
build:
16-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-24.04
1717

1818
strategy:
1919
fail-fast: false
2020
matrix:
2121
libgccjit_version:
22-
- { gcc: "gcc-13.deb" }
23-
- { gcc: "gcc-13-without-int128.deb" }
22+
- { gcc: "gcc-15.deb" }
23+
- { gcc: "gcc-15-without-int128.deb" }
2424
commands: [
2525
"--std-tests",
2626
# FIXME: re-enable asm tests when GCC can emit in the right syntax.
@@ -108,13 +108,13 @@ jobs:
108108
cargo clippy --all-targets --features master -- -D warnings
109109
110110
duplicates:
111-
runs-on: ubuntu-latest
111+
runs-on: ubuntu-24.04
112112
steps:
113113
- uses: actions/checkout@v4
114114
- run: python tools/check_intrinsics_duplicates.py
115115

116116
build_system:
117-
runs-on: ubuntu-latest
117+
runs-on: ubuntu-24.04
118118
steps:
119119
- uses: actions/checkout@v4
120120
- name: Test build system

.github/workflows/failures.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313

1414
jobs:
1515
build:
16-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-24.04
1717

1818
strategy:
1919
fail-fast: false
@@ -56,12 +56,12 @@ jobs:
5656
5757
- name: Download artifact
5858
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
59-
run: curl -LO https://github.com/rust-lang/gcc/releases/latest/download/gcc-13.deb
59+
run: curl -LO https://github.com/rust-lang/gcc/releases/latest/download/gcc-15.deb
6060

6161
- name: Setup path to libgccjit
6262
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
6363
run: |
64-
sudo dpkg --force-overwrite -i gcc-13.deb
64+
sudo dpkg --force-overwrite -i gcc-15.deb
6565
echo 'gcc-path = "/usr/lib"' > config.toml
6666
echo "LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV
6767
echo "LD_LIBRARY_PATH=/usr/lib" >> $GITHUB_ENV

.github/workflows/gcc12.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717

1818
jobs:
1919
build:
20-
runs-on: ubuntu-22.04
20+
runs-on: ubuntu-24.04
2121

2222
strategy:
2323
fail-fast: false

.github/workflows/m68k.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717

1818
jobs:
1919
build:
20-
runs-on: ubuntu-22.04
20+
runs-on: ubuntu-24.04
2121

2222
strategy:
2323
fail-fast: false
@@ -47,17 +47,17 @@ jobs:
4747
- name: Install packages
4848
run: |
4949
sudo apt-get update
50-
sudo apt-get install qemu qemu-user-static
50+
sudo apt-get install qemu-system qemu-user-static
5151
5252
- name: Download artifact
53-
run: curl -LO https://github.com/cross-cg-gcc-tools/cross-gcc/releases/latest/download/gcc-m68k-13.deb
53+
run: curl -LO https://github.com/cross-cg-gcc-tools/cross-gcc/releases/latest/download/gcc-m68k-15.deb
5454

5555
- name: Download VM artifact
5656
run: curl -LO https://github.com/cross-cg-gcc-tools/vms/releases/latest/download/debian-m68k.img
5757

5858
- name: Setup path to libgccjit
5959
run: |
60-
sudo dpkg -i gcc-m68k-13.deb
60+
sudo dpkg -i gcc-m68k-15.deb
6161
echo 'gcc-path = "/usr/lib/"' > config.toml
6262
6363
- name: Set env

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313

1414
jobs:
1515
build:
16-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-24.04
1717

1818
strategy:
1919
fail-fast: false
@@ -37,11 +37,11 @@ jobs:
3737
run: sudo apt-get install ninja-build ripgrep
3838

3939
- name: Download artifact
40-
run: curl -LO https://github.com/rust-lang/gcc/releases/latest/download/gcc-13.deb
40+
run: curl -LO https://github.com/rust-lang/gcc/releases/latest/download/gcc-15.deb
4141

4242
- name: Setup path to libgccjit
4343
run: |
44-
sudo dpkg --force-overwrite -i gcc-13.deb
44+
sudo dpkg --force-overwrite -i gcc-15.deb
4545
echo 'gcc-path = "/usr/lib/"' > config.toml
4646
4747
- name: Set env

libgccjit.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
45648c2edd4ecd862d9f08196d3d6c6ccba79f07
1+
e607be166673a8de9fc07f6f02c60426e556c5f2

0 commit comments

Comments
 (0)