[openwrt/openwrt] CI: build: add support for per branch tools container
LEDE Commits
lede-commits at lists.infradead.org
Sun Dec 4 07:37:44 PST 2022
ansuel pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/40536320ef2f30e3872ba2e1748efc3c8cb0e06d
commit 40536320ef2f30e3872ba2e1748efc3c8cb0e06d
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Sun Nov 27 19:53:08 2022 +0100
CI: build: add support for per branch tools container
Add support in build shared workflow for per branch tools container.
With pr the target branch is parsed and the right container is used.
To use the stable container for local testing the branch needs to have
the prefix openwrt-[0-9][0-9].[0-9][0-9]- (example openwrt-21.02-fixup)
Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
(cherry picked from commit abe8a4824210966e0899724bf4561a89216a1e36)
---
.github/workflows/build.yml | 29 ++++++++++++++++++++++++++++-
.github/workflows/check-kernel-patches.yml | 29 ++++++++++++++++++++++++++++-
2 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 347eb5a90c..510ff6a879 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,6 +31,7 @@ jobs:
outputs:
owner_lc: ${{ steps.lower_owner.outputs.owner_lc }}
ccache_hash: ${{ steps.ccache_hash.outputs.ccache_hash }}
+ container_tag: ${{ steps.determine_tools_container.outputs.container_tag }}
steps:
- name: Checkout
@@ -50,12 +51,38 @@ jobs:
| md5sum | awk '{ print $1 }')
echo "ccache_hash=$CCACHE_HASH" >> $GITHUB_OUTPUT
+ # Per branch tools container tag
+ # By default stick to latest
+ # For official test targetting openwrt stable branch
+ # Get the branch or parse the tag and push dedicated tools containers
+ # For local test to use the correct container for stable release testing
+ # you need to use for the branch name a prefix of openwrt-[0-9][0-9].[0-9][0-9]-
+ - name: Determine tools container tag
+ id: determine_tools_container
+ run: |
+ CONTAINER_TAG=latest
+ if [ -n "${{ github.base_ref }}" ]; then
+ if echo "${{ github.base_ref }}" | grep -q -E 'openwrt-[0-9][0-9]\.[0-9][0-9]'; then
+ CONTAINER_TAG="${{ github.base_ref }}"
+ fi
+ elif [ ${{ github.ref_type }} == "branch" ]; then
+ if echo "${{ github.ref_name }}" | grep -q -E 'openwrt-[0-9][0-9]\.[0-9][0-9]-'; then
+ CONTAINER_TAG="$(echo ${{ github.ref_name }} | sed 's/^\(openwrt-[0-9][0-9]\.[0-9][0-9]\)-.*/\1/')"
+ fi
+ elif [ ${{ github.ref_type }} == "tag" ]; then
+ if echo "${{ github.ref_name }}" | grep -q -E 'v[0-9][0-9]\.[0-9][0-9]\..+'; then
+ CONTAINER_TAG=openwrt-"$(echo ${{ github.ref_name }} | sed 's/v\([0-9][0-9]\.[0-9][0-9]\)\..\+/\1/')"
+ fi
+ fi
+ echo "Tools container to use tools:$CONTAINER_TAG"
+ echo "container_tag=$CONTAINER_TAG" >> $GITHUB_OUTPUT
+
build:
name: Build with external toolchain
needs: setup_build
runs-on: ubuntu-latest
- container: ghcr.io/${{ needs.setup_build.outputs.owner_lc }}/tools:latest
+ container: ghcr.io/${{ needs.setup_build.outputs.owner_lc }}/tools:${{ needs.setup_build.outputs.container_tag }}
permissions:
contents: read
diff --git a/.github/workflows/check-kernel-patches.yml b/.github/workflows/check-kernel-patches.yml
index c04cb27b37..f01782d5da 100644
--- a/.github/workflows/check-kernel-patches.yml
+++ b/.github/workflows/check-kernel-patches.yml
@@ -18,6 +18,7 @@ jobs:
runs-on: ubuntu-latest
outputs:
owner_lc: ${{ steps.lower_owner.outputs.owner_lc }}
+ container_tag: ${{ steps.determine_tools_container.outputs.container_tag }}
steps:
- name: Set lower case owner name
@@ -27,12 +28,38 @@ jobs:
| tr '[:upper:]' '[:lower:]')
echo "owner_lc=$OWNER_LC" >> $GITHUB_OUTPUT
+ # Per branch tools container tag
+ # By default stick to latest
+ # For official test targetting openwrt stable branch
+ # Get the branch or parse the tag and push dedicated tools containers
+ # For local test to use the correct container for stable release testing
+ # you need to use for the branch name a prefix of openwrt-[0-9][0-9].[0-9][0-9]-
+ - name: Determine tools container tag
+ id: determine_tools_container
+ run: |
+ CONTAINER_TAG=latest
+ if [ -n "${{ github.base_ref }}" ]; then
+ if echo "${{ github.base_ref }}" | grep -q -E 'openwrt-[0-9][0-9]\.[0-9][0-9]'; then
+ CONTAINER_TAG="${{ github.base_ref }}"
+ fi
+ elif [ ${{ github.ref_type }} == "branch" ]; then
+ if echo "${{ github.ref_name }}" | grep -q -E 'openwrt-[0-9][0-9]\.[0-9][0-9]-'; then
+ CONTAINER_TAG="$(echo ${{ github.ref_name }} | sed 's/^\(openwrt-[0-9][0-9]\.[0-9][0-9]\)-.*/\1/')"
+ fi
+ elif [ ${{ github.ref_type }} == "tag" ]; then
+ if echo "${{ github.ref_name }}" | grep -q -E 'v[0-9][0-9]\.[0-9][0-9]\..+'; then
+ CONTAINER_TAG=openwrt-"$(echo ${{ github.ref_name }} | sed 's/v\([0-9][0-9]\.[0-9][0-9]\)\..\+/\1/')"
+ fi
+ fi
+ echo "Tools container to use tools:$CONTAINER_TAG"
+ echo "container_tag=$CONTAINER_TAG" >> $GITHUB_OUTPUT
+
check-patch:
name: Check Kernel patches
needs: setup_build
runs-on: ubuntu-latest
- container: ghcr.io/${{ needs.setup_build.outputs.owner_lc }}/tools:latest
+ container: ghcr.io/${{ needs.setup_build.outputs.owner_lc }}/tools:${{ needs.setup_build.outputs.container_tag }}
permissions:
contents: read
More information about the lede-commits
mailing list