From 0abfdf1a71184511b5b72405ac31ce03e0099612 Mon Sep 17 00:00:00 2001 From: animetosho Date: Tue, 10 Dec 2024 20:40:42 +1000 Subject: [PATCH] Update GHA Apt repo refs --- .github/workflows/build-dev-mac-arm64.yml | 6 +++--- .github/workflows/build-dev.yml | 6 +++--- .github/workflows/build.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-dev-mac-arm64.yml b/.github/workflows/build-dev-mac-arm64.yml index 63214f42..dd3bcf1a 100644 --- a/.github/workflows/build-dev-mac-arm64.yml +++ b/.github/workflows/build-dev-mac-arm64.yml @@ -8,12 +8,12 @@ jobs: runs-on: ubuntu-22.04 steps: # workaround issue with OpenSSL 3.0.2 on 22.04: https://github.com/tpoechtrager/osxcross/issues/349 - # issue is fixed in 3.0.7, so grab 3.0.8 from Ubuntu 23.04 + # issue is fixed in 3.0.7, so grab 3.0.13 from Ubuntu 24.04 - run: | - echo 'deb http://archive.ubuntu.com/ubuntu/ lunar main' | sudo tee -a /etc/apt/sources.list.d/lunar.list >/dev/null + echo 'deb http://archive.ubuntu.com/ubuntu/ noble main' | sudo tee -a /etc/apt/sources.list.d/noble.list >/dev/null echo 'APT::Default-Release "jammy";' | sudo tee -a /etc/apt/apt.conf >/dev/null sudo apt update - sudo apt -t=lunar -y install openssl + sudo apt -t=noble -y install openssl - uses: mbround18/setup-osxcross@main # OSXCROSS_TARGET unavailable in v1.1 with: osx-version: "12.3" diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index 9e4e9d86..318a881f 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -179,12 +179,12 @@ jobs: runs-on: ubuntu-22.04 steps: # workaround issue with OpenSSL 3.0.2 on 22.04: https://github.com/tpoechtrager/osxcross/issues/349 - # issue is fixed in 3.0.7, so grab 3.0.8 from Ubuntu 23.04 + # issue is fixed in 3.0.7, so grab 3.0.13 from Ubuntu 24.04 - run: | - echo 'deb http://archive.ubuntu.com/ubuntu/ lunar main' | sudo tee -a /etc/apt/sources.list.d/lunar.list >/dev/null + echo 'deb http://archive.ubuntu.com/ubuntu/ noble main' | sudo tee -a /etc/apt/sources.list.d/noble.list >/dev/null echo 'APT::Default-Release "jammy";' | sudo tee -a /etc/apt/apt.conf >/dev/null sudo apt update - sudo apt -t=lunar -y install openssl + sudo apt -t=noble -y install openssl - uses: mbround18/setup-osxcross@main # OSXCROSS_TARGET unavailable in v1.1 with: osx-version: "12.3" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08580d15..65fe1f43 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -142,12 +142,12 @@ jobs: runs-on: ubuntu-22.04 steps: # workaround issue with OpenSSL 3.0.2 on 22.04: https://github.com/tpoechtrager/osxcross/issues/349 - # issue is fixed in 3.0.7, so grab 3.0.8 from Ubuntu 23.04 + # issue is fixed in 3.0.7, so grab 3.0.13 from Ubuntu 24.04 - run: | - echo 'deb http://archive.ubuntu.com/ubuntu/ lunar main' | sudo tee -a /etc/apt/sources.list.d/lunar.list >/dev/null + echo 'deb http://archive.ubuntu.com/ubuntu/ noble main' | sudo tee -a /etc/apt/sources.list.d/noble.list >/dev/null echo 'APT::Default-Release "jammy";' | sudo tee -a /etc/apt/apt.conf >/dev/null sudo apt update - sudo apt -t=lunar -y install openssl + sudo apt -t=noble -y install openssl - uses: mbround18/setup-osxcross@main # OSXCROSS_TARGET unavailable in v1.1 with: osx-version: "12.3"