From e6b996f0e10d8a4260c60290964dfbff124912f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 Apr 2021 04:09:42 +0200 Subject: [PATCH 1/2] Revert "actions: pin Ubuntu version" This reverts commit d9621048edad562a9400eb259cde3e8a88e2f43d. --- .github/workflows/build-gluon.yml | 2 +- contrib/actions/generate-actions.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-gluon.yml b/.github/workflows/build-gluon.yml index c92ce470..889bfb82 100644 --- a/.github/workflows/build-gluon.yml +++ b/.github/workflows/build-gluon.yml @@ -33,7 +33,7 @@ jobs: fail-fast: false matrix: target: [ar71xx-generic, ar71xx-tiny, ar71xx-nand, ath79-generic, brcm2708-bcm2708, brcm2708-bcm2709, ipq40xx-generic, ipq806x-generic, lantiq-xrx200, lantiq-xway, mpc85xx-generic, mpc85xx-p1020, ramips-mt7620, ramips-mt7621, ramips-mt76x8, ramips-rt305x, sunxi-cortexa7, x86-generic, x86-geode, x86-legacy, x86-64, ar71xx-mikrotik, brcm2708-bcm2710, mvebu-cortexa9] - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - name: Install Dependencies diff --git a/contrib/actions/generate-actions.py b/contrib/actions/generate-actions.py index 5841a806..3b5a0984 100755 --- a/contrib/actions/generate-actions.py +++ b/contrib/actions/generate-actions.py @@ -37,7 +37,7 @@ jobs: fail-fast: false matrix: target: [{matrix}] - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - name: Install Dependencies From 394bc8e6bdf4ae27a8fca3316db483fda5785075 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 Apr 2021 04:11:04 +0200 Subject: [PATCH 2/2] contrib/actions: drop custom sources.list --- contrib/actions/install-dependencies.sh | 2 -- contrib/actions/sources.list | 2 -- 2 files changed, 4 deletions(-) delete mode 100644 contrib/actions/sources.list diff --git a/contrib/actions/install-dependencies.sh b/contrib/actions/install-dependencies.sh index 60e4a9ee..fc4c8e96 100755 --- a/contrib/actions/install-dependencies.sh +++ b/contrib/actions/install-dependencies.sh @@ -2,8 +2,6 @@ set -e -cp contrib/actions/sources.list /etc/apt/sources.list -rm -rf /etc/apt/sources.list.d apt update apt install git subversion build-essential python gawk unzip libncurses5-dev zlib1g-dev libssl-dev wget time apt clean diff --git a/contrib/actions/sources.list b/contrib/actions/sources.list deleted file mode 100644 index 64c6aae7..00000000 --- a/contrib/actions/sources.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://mirror.netcologne.de/ubuntu/ bionic main restricted -deb http://mirror.netcologne.de/ubuntu/ bionic-updates main restricted