From 943b60c6ac05a77c658288812888c96a45d176c9 Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Tue, 17 Sep 2024 12:39:47 +0000 Subject: [PATCH] [ci] Build package on OpenWrt 23.05 branch #216 Use Ubuntu 24.04 for build OS Closes #216 --- .github/workflows/ci.yml | 8 ++++---- runbuild | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3d00c7..8e55d20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ on: jobs: tests: name: QA-Checks and Tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v2 @@ -21,7 +21,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.x - name: Install Dependencies id: deps @@ -49,7 +49,7 @@ jobs: build: name: Build and Upload Packages needs: tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 env: BUILD_DIR: "/home/runner/work/build" DOWNLOADS_DIR: "/home/runner/work/downloads" @@ -81,7 +81,7 @@ jobs: CI_CACHE: ${{ steps.cache.outputs.cache-hit }} - name: Upload packages as artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: Packages path: "${{ env.DOWNLOADS_DIR }}/${{ env.START_TIME }}" diff --git a/runbuild b/runbuild index 7224b25..5f114b6 100755 --- a/runbuild +++ b/runbuild @@ -20,14 +20,14 @@ COMPILE_TARGET=${COMPILE_TARGET-mips_24kc} LATEST_LINK="$DOWNLOADS_DIR/latest" CORES=${CORES:-1} CURRENT_DIR=$(pwd) -OPENWRT_BRANCH="openwrt-21.02" +OPENWRT_BRANCH="openwrt-23.05" mkdir -p "$BUILD_DIR" mkdir -p "$VERSIONED_DIR" cd "$BUILD_DIR" if ! [ -d "openwrt" ]; then - git clone https://git.openwrt.org/openwrt/openwrt.git + git clone https://git.openwrt.org/openwrt/openwrt.git --depth 1 --branch $OPENWRT_BRANCH fi cd openwrt git reset --hard HEAD