Skip to content

Commit afad7c1

Browse files
authored
MNT: update GCC versions for ubuntu-latest runner, upgrade build base images (#188)
1 parent 2252b3e commit afad7c1

File tree

4 files changed

+30
-16
lines changed

4 files changed

+30
-16
lines changed

.github/actions/build_arm64/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM golang:1.23-bullseye
1+
FROM golang:1.23-bookworm
22

33
RUN \
44
dpkg --add-architecture arm64 && \
55
apt-get update && \
66
apt-get install -y ca-certificates openssl zip curl jq \
7-
gcc-10-aarch64-linux-gnu gcc-aarch64-linux-gnu libsqlite3-dev:arm64 && \
7+
gcc-12-aarch64-linux-gnu gcc-aarch64-linux-gnu libsqlite3-dev:arm64 && \
88
update-ca-certificates && \
99
rm -rf /var/lib/apt
1010

.github/actions/build_x86_64/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23-bullseye
1+
FROM golang:1.23-bookworm
22

33
RUN \
44
apt-get update && \

.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
go: [1.21.x]
23+
go: [1.23.x]
2424

2525
steps:
2626
- name: Install GCC (Ubuntu)

.github/workflows/test.yml

+26-12
Original file line numberDiff line numberDiff line change
@@ -47,29 +47,43 @@ jobs:
4747
CGO_ENABLED: 1
4848
GOOS: linux
4949
GOARCH: arm64
50-
CC: "/usr/bin/aarch64-linux-gnu-gcc-11"
50+
CC: "/usr/bin/aarch64-linux-gnu-gcc-13"
5151
steps:
52-
# Patch azure archives for [amd64, i386] use only and add
53-
# arm64 ports (derived from ryankurte/action-apt)
52+
# Update sources to split out amd64 vs arm64 since arm64 is not supported on all mirrors
53+
# adaped from https://github.com/shamil-mubarakshin/tests-repository/blob/main/.github/workflows/run-ubuntu-matrix.yml
5454
- name: Update sources for arm64
5555
shell: bash
5656
run: |
5757
sudo dpkg --add-architecture arm64
58-
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | sudo tee /etc/apt/sources.list
59-
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
60-
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
61-
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
62-
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe" | sudo tee -a /etc/apt/sources.list
63-
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe" | sudo tee -a /etc/apt/sources.list
64-
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe"| sudo tee -a /etc/apt/sources.list
65-
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe" | sudo tee -a /etc/apt/sources.list
58+
cat <<EOF > deb822sources
59+
Types: deb
60+
URIs: http://archive.ubuntu.com/ubuntu/
61+
Suites: noble noble-updates
62+
Components: main restricted universe
63+
Architectures: amd64
64+
65+
Types: deb
66+
URIs: http://security.ubuntu.com/ubuntu/
67+
Suites: noble-security
68+
Components: main restricted universe
69+
Architectures: amd64
70+
71+
Types: deb
72+
URIs: http://azure.ports.ubuntu.com/ubuntu-ports/
73+
Suites: noble noble-updates
74+
Components: main restricted multiverse universe
75+
Architectures: arm64
76+
77+
EOF
78+
79+
sudo mv deb822sources /etc/apt/sources.list.d/ubuntu.sources
6680
6781
- name: Install GCC and SQLite for Arm64
6882
shell: bash
6983
run: |
7084
sudo apt-get update
7185
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \
72-
gcc-11-aarch64-linux-gnu \
86+
gcc-13-aarch64-linux-gnu \
7387
libsqlite3-dev:arm64 \
7488
file
7589
- name: Install Go

0 commit comments

Comments
 (0)