Skip to content

Commit edb16f8

Browse files
authored
Merge pull request #188
Upgrade Ubuntu runners from 20.04 to 22.04
2 parents 9957b6a + ce78f8b commit edb16f8

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.github/workflows/build-nativeshims.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464

6565
build-linux-amd64:
6666
name: Build Linux (amd64)
67-
runs-on: ubuntu-20.04
67+
runs-on: ubuntu-24.04
6868
steps:
6969
- uses: actions/checkout@v4
7070
- run: |
@@ -78,7 +78,7 @@ jobs:
7878

7979
build-linux-arm64:
8080
name: Build Linux (arm64)
81-
runs-on: ubuntu-20.04
81+
runs-on: ubuntu-24.04
8282
steps:
8383
- uses: actions/checkout@v4
8484
- run: |

Yubico.NativeShims/build-linux-arm64.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# Set environment variables
44
export VCPKG_INSTALLATION_ROOT=$GITHUB_WORKSPACE/vcpkg \
55
VCPKG_FORCE_SYSTEM_BINARIES=1 \
6+
VCPKG_DISABLE_METRICS=1 \
67
PATH=/usr/local/bin:$VCPKG_INSTALLATION_ROOT:$PATH
78

89
# Install necessary packages
@@ -22,22 +23,23 @@ DEBIAN_FRONTEND=noninteractive sudo apt-get install -yq \
2223
zlib1g-dev \
2324
ninja-build \
2425
g++-aarch64-linux-gnu \
25-
gcc-aarch64-linux-gnu
26+
gcc-aarch64-linux-gnu \
27+
linux-libc-dev
2628

27-
# Install latest version of CMake for Ubuntu 20.04
29+
# Install latest version of CMake for Ubuntu
2830
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
29-
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
31+
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ noble main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
3032
sudo apt-get update -qq
3133
sudo apt-get install cmake -yq
3234

3335
# Install VCPKG
3436
git clone https://github.com/Microsoft/vcpkg.git ${VCPKG_INSTALLATION_ROOT} && ${VCPKG_INSTALLATION_ROOT}/bootstrap-vcpkg.sh
3537

3638
# Install arm64 version of libpcsclite
37-
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe multiverse
38-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe multiverse
39-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse
40-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list > /dev/null
39+
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse
40+
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse
41+
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse
42+
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-backports main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/arm64.list
4143
sudo dpkg --add-architecture arm64
4244
sudo apt-get update -qq
4345
sudo apt-get install libpcsclite-dev:arm64 -yq

0 commit comments

Comments
 (0)