Skip to content

Commit

Permalink
ci: change repositories and bumped version
Browse files Browse the repository at this point in the history
ubuntu 22.04 to 24.04
  • Loading branch information
DennisDyallo committed Jan 17, 2025
1 parent 062487e commit 619cafa
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-nativeshims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:

build-linux-amd64:
name: Build Linux (amd64)
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- run: |
Expand All @@ -78,7 +78,7 @@ jobs:

build-linux-arm64:
name: Build Linux (arm64)
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- run: |
Expand Down
14 changes: 8 additions & 6 deletions Yubico.NativeShims/build-linux-arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# Set environment variables
export VCPKG_INSTALLATION_ROOT=$GITHUB_WORKSPACE/vcpkg \
VCPKG_FORCE_SYSTEM_BINARIES=1 \
VCPKG_DISABLE_METRICS=1 \
PATH=/usr/local/bin:$VCPKG_INSTALLATION_ROOT:$PATH

# Install necessary packages
Expand All @@ -23,21 +24,22 @@ DEBIAN_FRONTEND=noninteractive sudo apt-get install -yq \
ninja-build \
g++-aarch64-linux-gnu \
gcc-aarch64-linux-gnu \
linux-libc-dev \

# Install latest version of CMake for Ubuntu 20.04
# Install latest version of CMake for Ubuntu
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
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
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
sudo apt-get update -qq
sudo apt-get install cmake -yq

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

# Install arm64 version of libpcsclite
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe multiverse
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe multiverse
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list > /dev/null
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports noble-backports main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/arm64.list
sudo dpkg --add-architecture arm64
sudo apt-get update -qq
sudo apt-get install libpcsclite-dev:arm64 -yq
Expand Down

0 comments on commit 619cafa

Please sign in to comment.