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

MNT: update GCC versions for ubuntu-latest runner, upgrade build base images #188

Merged
merged 7 commits into from
Dec 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/actions/build_arm64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM golang:1.23-bullseye
FROM golang:1.23-bookworm

RUN \
dpkg --add-architecture arm64 && \
apt-get update && \
apt-get install -y ca-certificates openssl zip curl jq \
gcc-10-aarch64-linux-gnu gcc-aarch64-linux-gnu libsqlite3-dev:arm64 && \
gcc-12-aarch64-linux-gnu gcc-aarch64-linux-gnu libsqlite3-dev:arm64 && \
update-ca-certificates && \
rm -rf /var/lib/apt

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build_x86_64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23-bullseye
FROM golang:1.23-bookworm

RUN \
apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go: [1.21.x]
go: [1.23.x]

steps:
- name: Install GCC (Ubuntu)
Expand Down
38 changes: 26 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,29 +47,43 @@ jobs:
CGO_ENABLED: 1
GOOS: linux
GOARCH: arm64
CC: "/usr/bin/aarch64-linux-gnu-gcc-11"
CC: "/usr/bin/aarch64-linux-gnu-gcc-13"
steps:
# Patch azure archives for [amd64, i386] use only and add
# arm64 ports (derived from ryankurte/action-apt)
# Update sources to split out amd64 vs arm64 since arm64 is not supported on all mirrors
# adaped from https://github.com/shamil-mubarakshin/tests-repository/blob/main/.github/workflows/run-ubuntu-matrix.yml
- name: Update sources for arm64
shell: bash
run: |
sudo dpkg --add-architecture arm64
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | sudo tee /etc/apt/sources.list
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe" | sudo tee -a /etc/apt/sources.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe" | sudo tee -a /etc/apt/sources.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe"| sudo tee -a /etc/apt/sources.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe" | sudo tee -a /etc/apt/sources.list
cat <<EOF > deb822sources
Types: deb
URIs: http://archive.ubuntu.com/ubuntu/
Suites: noble noble-updates
Components: main restricted universe
Architectures: amd64

Types: deb
URIs: http://security.ubuntu.com/ubuntu/
Suites: noble-security
Components: main restricted universe
Architectures: amd64

Types: deb
URIs: http://azure.ports.ubuntu.com/ubuntu-ports/
Suites: noble noble-updates
Components: main restricted multiverse universe
Architectures: arm64

EOF

sudo mv deb822sources /etc/apt/sources.list.d/ubuntu.sources

- name: Install GCC and SQLite for Arm64
shell: bash
run: |
sudo apt-get update
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \
gcc-11-aarch64-linux-gnu \
gcc-13-aarch64-linux-gnu \
libsqlite3-dev:arm64 \
file
- name: Install Go
Expand Down
Loading